PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,813 Commits 1 Branch 0 Tags
f693ff9efa2ea0a3ec390fa390090a895b971b8c
Commit Graph

18813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Crowley
e722c375df am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev 
* commit '807386b79097369136e1c00c5a4a56e99659fa94':
  Force power cycle on cooldown.
 2014-11-17 13:38:37 +00:00
Paul Crowley
807386b790 am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev 
* commit 'bf88566dc77f01f5c5a4cd038a9e96e22fbf84fb':
  Force power cycle on cooldown.
 2014-11-17 13:34:26 +00:00
Paul Crowley
bf88566dc7 Merge "Force power cycle on cooldown." into lmp-mr1-dev 2014-11-17 13:29:50 +00:00
Alexandra Gherghina
2a3d649766 Fix NPE caused by status update outside activity lifecycle 
Bug: 18373656
Change-Id: I3c7db15df7c47b65a42a13fc7a3a077c3ad48f77
 2014-11-17 12:12:11 +00:00
Prem Kumar
c3dd561fc2 am 51dd2ac0: am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-dev automerge: ce52a4b 
* commit '51dd2ac0715d93b95cad0dbdf04cb0ba5d12e964':
  Fix Sim Setting OOB error.
 2014-11-15 03:09:35 +00:00
Amith Yamasani
c850fb0c4d am 23e01f1f: am c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" into lmp-mr1-dev automerge: 0fc76ae 
* commit '23e01f1f0d1d50389d72d93baf5a56cea1272b14':
  Don't show SMS app settings for restricted profiles
 2014-11-15 03:09:16 +00:00
Jeff Davidson
a1aba5484b am 13259fd3: am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev automerge: 0ae8d5c 
* commit '13259fd3a1666018328a45095cca5918a7c297d0':
  Final UX for Wi-Fi assistant platform settings.
 2014-11-15 03:09:14 +00:00
Prem Kumar
51dd2ac071 am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-dev 
automerge: ce52a4b

* commit 'ce52a4bcbb267c1a7e526787f0a8f92e12e1d406':
  Fix Sim Setting OOB error.
 2014-11-15 02:49:28 +00:00
Prem Kumar
ce52a4bcbb am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-dev 
* commit 'b4e9a055bf5c59c1b7f42f73c7572f865d318994':
  Fix Sim Setting OOB error.
 2014-11-15 02:28:17 +00:00
Prem Kumar
b4e9a055bf Merge "Fix Sim Setting OOB error." into lmp-mr1-dev 2014-11-15 02:15:10 +00:00
Amith Yamasani
23e01f1f0d am c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" into lmp-mr1-dev 
automerge: 0fc76ae

* commit '0fc76aea99aae033e6d213c673b7d4b0460d91ab':
  Don't show SMS app settings for restricted profiles
 2014-11-15 01:25:33 +00:00
Jeff Davidson
13259fd3a1 am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 
automerge: 0ae8d5c

* commit '0ae8d5caa854199cbf727e89940b8a408b34dc8c':
  Final UX for Wi-Fi assistant platform settings.
 2014-11-15 01:24:18 +00:00
Amith Yamasani
0fc76aea99 am c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" into lmp-mr1-dev 
* commit 'c395b9f37a525f1cd26654c41f7fe4f401af085a':
  Don't show SMS app settings for restricted profiles
 2014-11-15 00:57:07 +00:00
Amith Yamasani
c395b9f37a Merge "Don't show SMS app settings for restricted profiles" into lmp-mr1-dev 2014-11-15 00:50:15 +00:00
Jeff Davidson
0ae8d5caa8 am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 
* commit 'c01754bac9dffb58221f418d0b8418862b43b117':
  Final UX for Wi-Fi assistant platform settings.
 2014-11-15 00:21:59 +00:00
Jeff Davidson
c01754bac9 Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev 2014-11-15 00:17:03 +00:00
Jeff Davidson
ce32b21727 Final UX for Wi-Fi assistant platform settings. 
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
 2014-11-14 15:27:21 -08:00
John Spurlock
28b826a7da am 94ad9981: am fdebfc35: Settings: Add effects suppression text to Ring volume. automerge: d099aa6 
* commit '94ad99814abfd1822b1597ddb4068fbc838e0123':
  Settings: Add effects suppression text to Ring volume.
 2014-11-14 23:00:57 +00:00
John Spurlock
94ad99814a am fdebfc35: Settings: Add effects suppression text to Ring volume. 
automerge: d099aa6

* commit 'd099aa62ef1437dd5bb71e7b8e68885f7a1d7cc0':
  Settings: Add effects suppression text to Ring volume.
 2014-11-14 22:56:18 +00:00
Jeff Sharkey
06fc055bfa am 989f8a11: am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev automerge: f685335 
* commit '989f8a11b2852ff818a6839642db1661606fb549':
  Migrate license display to HTMLViewer.
 2014-11-14 21:55:40 +00:00
Jeff Sharkey
989f8a11b2 am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 
automerge: f685335

* commit 'f6853357ac029ad82e99442066d5b6adc1286a06':
  Migrate license display to HTMLViewer.
 2014-11-14 21:47:04 +00:00
John Spurlock
d099aa62ef am fdebfc35: Settings: Add effects suppression text to Ring volume. 
* commit 'fdebfc35c43c445afcd39077f5cbcf72902b1d6e':
  Settings: Add effects suppression text to Ring volume.
 2014-11-14 21:44:47 +00:00
John Spurlock
fdebfc35c4 Settings: Add effects suppression text to Ring volume. 
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
 2014-11-14 14:38:03 -05:00
Jeff Sharkey
f6853357ac am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 
* commit 'c88cdea2bb6f830abb8f1fe3b422368d3275f88c':
  Migrate license display to HTMLViewer.
 2014-11-14 19:29:31 +00:00
Jeff Sharkey
c88cdea2bb Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev 2014-11-14 19:24:43 +00:00
Robin Lee
a126948e0c am 53ad5ec7: am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 
* commit '53ad5ec71b26197e64ac247b1f811a5583eaf98e':
  Forward wifi cert install intents to primary user
 2014-11-14 19:19:45 +00:00
Elliott Hughes
30cc30864b Remove vestigial "Choose date format" option. 
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
 2014-11-14 11:16:16 -08:00
PauloftheWest
1d891b4caa Added tabs for Multi-SIM SIM Lock. 
Bug: 18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
 2014-11-14 10:38:43 -08:00
PauloftheWest
0ee68facad Fix Sim Setting OOB error. 
+ Cleanup: deleted dead code.

Bug: 18380862
Change-Id: Ie5dc44c6c0fe50cd9243a19050b6d79732d2d014
 2014-11-14 10:18:07 -08:00
Jeff Sharkey
e16e44f756 Migrate license display to HTMLViewer. 
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
 2014-11-14 09:46:33 -08:00
Robin Lee
53ad5ec71b am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 
* commit '983253d18acef74ea1f35e20085e8fb1b5fe2265':
  Forward wifi cert install intents to primary user
 2014-11-14 11:32:04 +00:00
Robin Lee
983253d18a am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 
* commit 'e464d9b9ee133d366bec1b6c879889572c9996d8':
  Forward wifi cert install intents to primary user
 2014-11-14 11:28:43 +00:00
Robin Lee
e464d9b9ee Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev 2014-11-14 11:26:39 +00:00
PauloftheWest
3dc6c4e6f3 am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a':
  Adding Sim Status menu to Settings.
 2014-11-14 00:43:19 +00:00
PauloftheWest
63f7bc87d8 Created Multi-SIM notifications. 
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.

Bug: 18293625

Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
 2014-11-13 15:05:02 -08:00
PauloftheWest
f95f2590c1 am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit '0f4254fab38fc7b47e4532446dd13338aa4c2cf0':
  Adding Sim Status menu to Settings.
 2014-11-13 15:15:46 +00:00
PauloftheWest
0f4254fab3 am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 
* commit '26104298eb53d2dfa693eec32934f9ac0aa3d525':
  Adding Sim Status menu to Settings.
 2014-11-13 15:08:03 +00:00
Paul Crowley
51e0811a7a Force power cycle on cooldown. 
Bug: 18292029
Change-Id: I02b6eff56902859ae3aba4909656553f4b322b0c
 2014-11-13 14:52:19 +00:00
PauloftheWest
26104298eb Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev 2014-11-13 13:57:09 +00:00
Robin Lee
8823c3eda2 Forward wifi cert install intents to primary user 
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
 2014-11-13 11:19:15 +00:00
Geoff Mendal
a34d65ae20 am 22ab79dd: (-s ours) am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '22ab79dd47e882fc3e7417fa148da89234b0ad35':
  Import translations. DO NOT MERGE
 2014-11-13 02:15:55 +00:00
Sanket Padawe
6d795b9161 am 2856fb31: am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit '2856fb31e8b573b54f8064941795efcd8a9324bd':
  UI changes for icons in sim settings
 2014-11-13 02:13:26 +00:00
Geoff Mendal
c442da4f7e am b05537c0: (-s ours) am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit 'b05537c0ae85b43c7497f8b1dd1bda9f910707d9':
  Import translations. DO NOT MERGE
 2014-11-13 02:13:25 +00:00
Geoff Mendal
22ab79dd47 am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '28408035173a5e15f6ccc119bc61127cfd989f0c':
  Import translations. DO NOT MERGE
 2014-11-13 00:00:37 +00:00
Sanket Padawe
2856fb31e8 am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev 
* commit 'f722ff93fc2c2e6799970a29e59d5db0a152b1e4':
  UI changes for icons in sim settings
 2014-11-12 23:50:34 +00:00
Geoff Mendal
b05537c0ae am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE 
* commit '1503406487bb2f0412fce00c83533093006b04d7':
  Import translations. DO NOT MERGE
 2014-11-12 23:50:33 +00:00
Geoff Mendal
2840803517 am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c5079a06dc2f57718cd781ae855b687a14cc1c2f':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:23 +00:00
Amith Yamasani
32505ac699 Don't show SMS app settings for restricted profiles 
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
 2014-11-12 15:35:17 -08:00
Geoff Mendal
c5079a06dc am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '827ad0c38c76b932237fc22ecfcb35bff8de148f':
  Import translations. DO NOT MERGE
 2014-11-12 23:34:27 +00:00
Geoff Mendal
827ad0c38c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:30:10 +00:00