summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ba586392: am 3dd51556: Merge "Remove vestigial "Choose date format" option."Elliott Hughes2014-11-175-96/+4
|\ | | | | | | | | * commit 'ba5863929a5679b14e8dcc70c9d6f777a675459a': Remove vestigial "Choose date format" option.
| * am 3dd51556: Merge "Remove vestigial "Choose date format" option."Elliott Hughes2014-11-175-96/+4
| |\ | | | | | | | | | | | | * commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee': Remove vestigial "Choose date format" option.
| | * Merge "Remove vestigial "Choose date format" option."Elliott Hughes2014-11-175-96/+4
| | |\
| | | * Remove vestigial "Choose date format" option.Elliott Hughes2014-11-145-96/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Almost all of our date formatting goes via icu these days, so this is a no-op almost everywhere. (And should be a no-op everywhere soon.) There's no obvious way to fix it, so remove it. UI guidelines say we should use spelled out month names anyway. Bug: 18322220 Change-Id: Ic9e903eceab3c096426f313bf4ef3a38644774e1
* | | am 5cf2b43f: am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM ↵PauloftheWest2014-11-172-1/+133
|\ \ \ | |/ / | | | | | | | | | | | | | | | Lock." into lmp-mr1-dev * commit '5cf2b43f914fa3268d1adf8abace74f34d651baf': Added tabs for Multi-SIM SIM Lock.
| * | am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into ↵PauloftheWest2014-11-172-1/+133
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'de16eb6e5346714a57973095f4d1854aa13f54bd': Added tabs for Multi-SIM SIM Lock.
| | * \ am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-devPauloftheWest2014-11-172-1/+133
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'acb160baa3662b1e4d969005c476ab07d4a2825e': Added tabs for Multi-SIM SIM Lock.
| | | * \ Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-devPauloftheWest2014-11-172-1/+133
| | | |\ \
| | | | * | Added tabs for Multi-SIM SIM Lock.PauloftheWest2014-11-142-1/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18147652 Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
* | | | | | am e722c375: am 807386b7: am bf88566d: Merge "Force power cycle on ↵Paul Crowley2014-11-172-50/+32
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cooldown." into lmp-mr1-dev * commit 'e722c375df0155c581cb3eb79f4fcc5f8891d738': Force power cycle on cooldown.
| * | | | | am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into ↵Paul Crowley2014-11-172-50/+32
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '807386b79097369136e1c00c5a4a56e99659fa94': Force power cycle on cooldown.
| | * | | | am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-devPaul Crowley2014-11-172-50/+32
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'bf88566dc77f01f5c5a4cd038a9e96e22fbf84fb': Force power cycle on cooldown.
| | | * | | Merge "Force power cycle on cooldown." into lmp-mr1-devPaul Crowley2014-11-172-50/+32
| | | |\ \ \
| | | | * | | Force power cycle on cooldown.Paul Crowley2014-11-132-50/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18292029 Change-Id: I02b6eff56902859ae3aba4909656553f4b322b0c
* | | | | | | am 51dd2ac0: am b4e9a055: Merge "Fix Sim Setting OOB error." into ↵Prem Kumar2014-11-151-30/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: ce52a4b * commit '51dd2ac0715d93b95cad0dbdf04cb0ba5d12e964': Fix Sim Setting OOB error.
| * | | | | | am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-devPrem Kumar2014-11-151-30/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ce52a4b * commit 'ce52a4bcbb267c1a7e526787f0a8f92e12e1d406': Fix Sim Setting OOB error.
| | * | | | | am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-devPrem Kumar2014-11-151-30/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b4e9a055bf5c59c1b7f42f73c7572f865d318994': Fix Sim Setting OOB error.
| | | * | | | Merge "Fix Sim Setting OOB error." into lmp-mr1-devPrem Kumar2014-11-151-30/+5
| | | |\ \ \ \
| | | | * | | | Fix Sim Setting OOB error.PauloftheWest2014-11-141-30/+5
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Cleanup: deleted dead code. Bug: 18380862 Change-Id: Ie5dc44c6c0fe50cd9243a19050b6d79732d2d014
* | | | | | | am 23e01f1f: am c395b9f3: Merge "Don\'t show SMS app settings for restricted ↵Amith Yamasani2014-11-151-9/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profiles" into lmp-mr1-dev automerge: 0fc76ae * commit '23e01f1f0d1d50389d72d93baf5a56cea1272b14': Don't show SMS app settings for restricted profiles
| * | | | | | am c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" ↵Amith Yamasani2014-11-151-9/+20
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 0fc76ae * commit '0fc76aea99aae033e6d213c673b7d4b0460d91ab': Don't show SMS app settings for restricted profiles
| | * | | | | am c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" ↵Amith Yamasani2014-11-151-9/+20
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'c395b9f37a525f1cd26654c41f7fe4f401af085a': Don't show SMS app settings for restricted profiles
| | | * | | | Merge "Don't show SMS app settings for restricted profiles" into lmp-mr1-devAmith Yamasani2014-11-151-9/+20
| | | |\ \ \ \
| | | | * | | | Don't show SMS app settings for restricted profilesAmith Yamasani2014-11-121-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restricted profiles might not have an SMS app and there is currently no UI to enable/disable SMS for restricted profiles. SMS is disabled by default in this case. So hide the SMS app picker option in restricted profiles. Bug: 17521457 Change-Id: Id2bb3e4690a4afba75ebcec8531727ec150c5632
* | | | | | | | am 13259fd3: am c01754ba: Merge "Final UX for Wi-Fi assistant platform ↵Jeff Davidson2014-11-156-40/+111
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings." into lmp-mr1-dev automerge: 0ae8d5c * commit '13259fd3a1666018328a45095cca5918a7c297d0': Final UX for Wi-Fi assistant platform settings.
| * | | | | | | am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into ↵Jeff Davidson2014-11-156-40/+111
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 0ae8d5c * commit '0ae8d5caa854199cbf727e89940b8a408b34dc8c': Final UX for Wi-Fi assistant platform settings.
| | * | | | | | am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into ↵Jeff Davidson2014-11-156-40/+111
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'c01754bac9dffb58221f418d0b8418862b43b117': Final UX for Wi-Fi assistant platform settings.
| | | * | | | | Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-devJeff Davidson2014-11-156-40/+111
| | | |\ \ \ \ \
| | | | * | | | | Final UX for Wi-Fi assistant platform settings.Jeff Davidson2014-11-146-40/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one app is available, the toggle works as before. When multiple apps are available, we allow the user to choose the app in a dialog before turning on the setting. Bug: 13780935 Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
* | | | | | | | | am 94ad9981: am fdebfc35: Settings: Add effects suppression text to Ring ↵John Spurlock2014-11-149-115/+183
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volume. automerge: d099aa6 * commit '94ad99814abfd1822b1597ddb4068fbc838e0123': Settings: Add effects suppression text to Ring volume.
| * | | | | | | | am fdebfc35: Settings: Add effects suppression text to Ring volume.John Spurlock2014-11-149-115/+183
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d099aa6 * commit 'd099aa62ef1437dd5bb71e7b8e68885f7a1d7cc0': Settings: Add effects suppression text to Ring volume.
| | * | | | | | | am fdebfc35: Settings: Add effects suppression text to Ring volume.John Spurlock2014-11-149-115/+183
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fdebfc35c43c445afcd39077f5cbcf72902b1d6e': Settings: Add effects suppression text to Ring volume.
| | | * | | | | | Settings: Add effects suppression text to Ring volume.John Spurlock2014-11-149-115/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the effects are being muted by a notification listener, display a "Muted by <x>" msg instead of an active slider inside the Ring/Notification volume setting pref. Update volume pref design to optimize for this new custom appearance. Depends on frameworks/base: Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5 Bug: 17461563 Change-Id: I6da871e16009370402451a2ff507de4762644a80
* | | | | | | | | am 989f8a11: am c88cdea2: Merge "Migrate license display to HTMLViewer." ↵Jeff Sharkey2014-11-145-343/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: f685335 * commit '989f8a11b2852ff818a6839642db1661606fb549': Migrate license display to HTMLViewer.
| * | | | | | | | am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-devJeff Sharkey2014-11-145-343/+32
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f685335 * commit 'f6853357ac029ad82e99442066d5b6adc1286a06': Migrate license display to HTMLViewer.
| | * | | | | | | am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-devJeff Sharkey2014-11-145-343/+32
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c88cdea2bb6f830abb8f1fe3b422368d3275f88c': Migrate license display to HTMLViewer.
| | | * | | | | | Merge "Migrate license display to HTMLViewer." into lmp-mr1-devJeff Sharkey2014-11-145-343/+32
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | Migrate license display to HTMLViewer.Jeff Sharkey2014-11-145-343/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For security purposes, we're no longer allowing WebView to be loaded when running as system UID. Instead, we now launch HTMLViewer to show the details. Bug: 18376908 Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
* | | | | | | | | am 53ad5ec7: am 983253d1: am e464d9b9: Merge "Forward wifi cert install ↵Robin Lee2014-11-141-39/+96
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intents to primary user" into lmp-mr1-dev * commit '53ad5ec71b26197e64ac247b1f811a5583eaf98e': Forward wifi cert install intents to primary user
| * | | | | | | | am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to ↵Robin Lee2014-11-141-39/+96
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primary user" into lmp-mr1-dev * commit '983253d18acef74ea1f35e20085e8fb1b5fe2265': Forward wifi cert install intents to primary user
| | * | | | | | | am e464d9b9: Merge "Forward wifi cert install intents to primary user" into ↵Robin Lee2014-11-141-39/+96
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'e464d9b9ee133d366bec1b6c879889572c9996d8': Forward wifi cert install intents to primary user
| | | * | | | | | Merge "Forward wifi cert install intents to primary user" into lmp-mr1-devRobin Lee2014-11-141-39/+96
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Forward wifi cert install intents to primary userRobin Lee2014-11-131-39/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wifi certificates need to be installed on behalf of UID 1010 which belongs to user 0, even if the installer is another user. This requires a cross-profile switch before performing the install. Bug: 17605542 Change-Id: Ib3dfb4c280f1686d29005c7a044bf80dc00e963a
* | | | | | | | | am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to ↵PauloftheWest2014-11-145-0/+567
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings." into lmp-mr1-dev * commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a': Adding Sim Status menu to Settings.
| * | | | | | | | am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into ↵PauloftheWest2014-11-135-0/+567
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '0f4254fab38fc7b47e4532446dd13338aa4c2cf0': Adding Sim Status menu to Settings.
| | * | | | | | | am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-devPauloftheWest2014-11-135-0/+567
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '26104298eb53d2dfa693eec32934f9ac0aa3d525': Adding Sim Status menu to Settings.
| | | * | | | | | Merge "Adding Sim Status menu to Settings." into lmp-mr1-devPauloftheWest2014-11-135-0/+567
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Adding Sim Status menu to Settings.PauloftheWest2014-11-125-0/+567
| | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added tabs for Multi-SIM devices. + Most of the code was taken from MediaTek (https://partner-android-review.googlesource.com/#/c/181417) Bug: 18195254 Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
* | | | | | | | am 22ab79dd: (-s ours) am 28408035: (-s ours) am c5079a06: (-s ours) am ↵Geoff Mendal2014-11-130-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '22ab79dd47e882fc3e7417fa148da89234b0ad35': Import translations. DO NOT MERGE
| * | | | | | | am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge ↵Geoff Mendal2014-11-130-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '28408035173a5e15f6ccc119bc61127cfd989f0c': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2025-04-02 12:41:28 +0000