PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,330 Commits 1 Branch 0 Tags
be2d4f99593cf446ede31da28b3ab25a012cdf7d
Commit Graph

17330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
be2d4f9959 am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f17620e3d60e63425bdf3d14ce35116f6981c5b6':
  Import translations. DO NOT MERGE
 2014-11-18 02:06:53 +00:00
Geoff Mendal
f17620e3d6 am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '383d2ab6bd9a0e3755a40a3b0b98e939cc017a6c':
  Import translations. DO NOT MERGE
 2014-11-17 22:59:04 +00:00
Geoff Mendal
56491f296c am 6c30eb97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6c30eb976a32d21cd65a0281f24544a609657594':
  Import translations. DO NOT MERGE
 2014-11-17 22:54:23 +00: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
0bfe9ac100 am 661cbce8: am 02c4c517: Remove vestigial "Choose date format" option. 
* commit '661cbce865f16186579ef21eaca03baa46c8908b':
  Remove vestigial "Choose date format" option.
 2014-11-17 19:47:55 +00: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
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
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
Elliott Hughes
3dd51556bc Merge "Remove vestigial "Choose date format" option." 2014-11-17 17:28:39 +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
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
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
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
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
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
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
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