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

5889 Commits

Author SHA1 Message Date
Geoff Mendal
41ae403fa0 Import translations. DO NOT MERGE 
Change-Id: Iab22f476ee0efb824690089ee1b12efe44eba77f
Auto-generated-cl: translation import
 2014-11-19 11:19:12 -08:00
Sanket Padawe
d1cb0d3805 am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
  Adding icons to sim color selection in settings UI.
 2014-11-18 20:17:51 +00:00
PauloftheWest
ed6cf9c191 am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
  Created Multi-SIM notifications.
 2014-11-18 20:17:50 +00:00
Sanket Padawe
1115d93887 am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1ec6807a11b92ceca43e09d8517641150ccb826a':
  Adding icons to sim color selection in settings UI.
 2014-11-18 02:08:01 +00:00
PauloftheWest
5f0da57c65 am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit 'a41e40ec3039f77bbe7c02714d7a2abef24c0a6d':
  Created Multi-SIM notifications.
 2014-11-18 02:06:55 +00:00
Sanket Padawe
1ec6807a11 am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit 'd85aa17894db4928d010c1590c2c6ea781546230':
  Adding icons to sim color selection in settings UI.
 2014-11-17 23:57:18 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
PauloftheWest
a41e40ec30 am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '79381a928b998cc45ffeeea624d8bc4b77c6529a':
  Created Multi-SIM notifications.
 2014-11-17 22:59:24 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Geoff Mendal
edd2631cd4 Merge "Import translations. DO NOT MERGE" 2014-11-17 22:27:38 +00:00
Geoff Mendal
217ffe6bf8 Import translations. DO NOT MERGE 
Change-Id: Ie927e25029960f1ed0c8858e9162f4d2f235b687
Auto-generated-cl: translation import
 2014-11-17 14:24:08 -08:00
Geoff Mendal
6c30eb976a Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 22:13:18 +00:00
Geoff Mendal
0b78e252b7 Import translations. DO NOT MERGE 
Change-Id: Ia2caaac61701db1f431df0fa44827e1b6f617bcd
Auto-generated-cl: translation import
 2014-11-17 14:09:21 -08:00
Geoff Mendal
383d2ab6bd Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 22:06:48 +00:00
Geoff Mendal
1244b64f88 Import translations. DO NOT MERGE 
Change-Id: Idcf2d15fa650fc675efa5b7e5dbc0d86ed8aa4b8
Auto-generated-cl: translation import
 2014-11-17 14:04:27 -08:00
Elliott Hughes
661cbce865 am 02c4c517: Remove vestigial "Choose date format" option. 
* commit '02c4c517df0a7a7df617bddc3f48aa45d53006b2':
  Remove vestigial "Choose date format" option.
 2014-11-17 19:25:35 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI. 
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
 2014-11-17 10:43:37 -08:00
Elliott Hughes
02c4c517df 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

(cherry picked from commit 30cc30864b)

Change-Id: I2a84d69a1f21f71d8bce5b69202b07f1b422aa57
 2014-11-17 10:43:20 -08:00
Elliott Hughes
150b646833 am ba586392: am 3dd51556: Merge "Remove vestigial "Choose date format" option." 
* commit 'ba5863929a5679b14e8dcc70c9d6f777a675459a':
  Remove vestigial "Choose date format" option.
 2014-11-17 17:44:24 +00:00
Elliott Hughes
ba5863929a am 3dd51556: Merge "Remove vestigial "Choose date format" option." 
* commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee':
  Remove vestigial "Choose date format" option.
 2014-11-17 17:37:35 +00:00
PauloftheWest
74866c8634 am 5cf2b43f: am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 
* commit '5cf2b43f914fa3268d1adf8abace74f34d651baf':
  Added tabs for Multi-SIM SIM Lock.
 2014-11-17 16:23:47 +00:00
PauloftheWest
5cf2b43f91 am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 
* commit 'de16eb6e5346714a57973095f4d1854aa13f54bd':
  Added tabs for Multi-SIM SIM Lock.
 2014-11-17 16:20:14 +00:00
PauloftheWest
de16eb6e53 am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 
* commit 'acb160baa3662b1e4d969005c476ab07d4a2825e':
  Added tabs for Multi-SIM SIM Lock.
 2014-11-17 16:15:45 +00:00
PauloftheWest
acb160baa3 Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev 2014-11-17 16:12:44 +00:00
Paul Crowley
b674ebbca6 am e722c375: am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev 
* commit 'e722c375df0155c581cb3eb79f4fcc5f8891d738':
  Force power cycle on cooldown.
 2014-11-17 13:42:16 +00:00
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
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
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
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
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
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
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