PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,116 Commits 1 Branch 0 Tags
f29bc1df4e52090e2b55c63f63ef849722f267a4
Commit Graph

16116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
f29bc1df4e am 45893e65: Settings: Don\'t lose the switch bar returning to saver settings. 
* commit '45893e65b65a11abda22ea299f217d22c91228ca':
  Settings: Don't lose the switch bar returning to saver settings.
 2014-12-03 20:37:50 +00:00
John Spurlock
45893e65b6 Settings: Don't lose the switch bar returning to saver settings. 
Bug: 18595359
Change-Id: I01c24fd8ed304837338c2b353805b3d3324e1639
 2014-12-03 15:06:06 -05:00
Alexandra Gherghina
7b7966e5a3 am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev 
* commit '3c00e18ba7425a1837a1e458f16e5192254a196b':
  Modify account settings for better locale resolution
 2014-12-03 17:27:10 +00:00
Zoltan Szatmary-Ban
9b1ac239cd am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev 
* commit '84bc561848d55e320cbefd3acab8692e4f891a12':
  Show account icons for managed profiles on Settings > Factory Reset
 2014-12-03 17:27:09 +00:00
Alexandra Gherghina
3c00e18ba7 Merge "Modify account settings for better locale resolution" into lmp-mr1-dev 2014-12-03 12:15:39 +00:00
Alexandra Gherghina
62464b819e Modify account settings for better locale resolution 
Bug: 16282173
Change-Id: I2ab861464cdbbb1c1b0a5a7231f960d8ed9e90c6
 2014-12-03 10:50:54 +00:00
Zoltan Szatmary-Ban
84bc561848 Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev 2014-12-03 10:23:28 +00:00
Sanket Padawe
fc82a3dea6 am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev 
* commit 'ef4d17910673709977624ff6d9e8ec499e3ac2fa':
  Fixed improper capitalization related to trademark term in BT
 2014-12-03 02:29:06 +00:00
Sanket Padawe
5fe69a2cfd am 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev 
* commit '97c65a5ee6adbc7fa5b02e3a8bf31fbedb075326':
  New activity for enabling tethering using Quick Settings
 2014-12-03 02:29:04 +00:00
Sanket Padawe
408f0a2954 am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev 
* commit '37a0c07b9b73b8d99c43cfdce2bd0b78fdec2a2a':
  Fixed crash in sim settings due to wrong toString() call.
 2014-12-03 02:29:03 +00:00
Sanket Padawe
9e878b1b3a am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev 
* commit '430e01d01fb8ab51a4975d8f8d46760c7873f425':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.
 2014-12-03 02:29:02 +00:00
Maurice Lam
94c85309b2 am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 
* commit '7b484b9af07aa92c530312507ee9a8ea85b00198':
  [FRP] Theme interstitials for lock screen setup
 2014-12-03 02:28:58 +00:00
Baligh Uddin
47be93e97a am 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '187015873210af2923167d30f387e6d33fe01889':
  Import translations. DO NOT MERGE
 2014-12-03 02:28:57 +00:00
Sanket Padawe
ef4d179106 Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev 2014-12-03 01:36:10 +00:00
Sanket Padawe
97c65a5ee6 Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev 2014-12-03 01:34:00 +00:00
Sanket Padawe
37a0c07b9b Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev 2014-12-03 01:32:26 +00:00
Sanket Padawe
430e01d01f Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev 2014-12-03 01:31:43 +00:00
Maurice Lam
7b484b9af0 Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 2014-12-03 01:27:57 +00:00
Baligh Uddin
1870158732 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-03 01:26:37 +00:00
Baligh Uddin
ebb64630ae Import translations. DO NOT MERGE 
Change-Id: If02762d2b4f971f8ad83922eade1a2a8b85adca8
Auto-generated-cl: translation import
 2014-12-02 17:01:39 -08:00
Lucky Zhang
955f412c4b am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 
* commit '91177d1c1668d4efcffb69cc4cf9bf8bb7c96f19':
  [FRP] Show FRP warning when disabling secure unlock
 2014-12-02 23:53:07 +00:00
Lucky Zhang
91177d1c16 Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 2014-12-02 23:45:56 +00:00
Sanket Padawe
a04d07cc75 Fixing "SMS Messages" to "SMS messages" as per UX requirement. 
Bug: 17322866
Change-Id: Id4dcfc70ef4675adabeb42c3f6bdf5bdbe5f71f1
 2014-12-02 15:40:23 -08:00
PauloftheWest
cbf347c42d am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 
* commit '794cbd70fa3d101b1a8a587faf327c7700c946eb':
  Changed SIM lock toggle to a switch
 2014-12-02 21:27:43 +00:00
PauloftheWest
794cbd70fa Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 2014-12-02 21:19:52 +00:00
PauloftheWest
3fd2fa7b96 am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 
* commit '003aee5f0adfde950407380a5c738ed4bc59bf2b':
  Bug Fix: SIM Status will display the proper network type
 2014-12-02 20:08:06 +00:00
PauloftheWest
003aee5f0a Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 2014-12-02 20:01:40 +00:00
PauloftheWest
6fc9207ebe Bug Fix: SIM Status will display the proper network type 
Bug: 18414792
Change-Id: I41f838ab95eaf9d546e59c9e2a793bbab393cb27
 2014-12-02 11:59:17 -08:00
Simranjit Singh Kohli
04f2391d17 am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 
* commit '61066c13ed5ba493c58c76d84f489a35dc5af8d1':
  [New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
 2014-12-02 19:18:50 +00:00
Simranjit Singh Kohli
61066c13ed Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 2014-12-02 19:09:01 +00:00
Sanket Padawe
e06387ff5b Fixed crash in sim settings due to wrong toString() call. 
Bug: 18589605
Change-Id: I2ae756f113904e1325ad3cc686cee0300cbd71e4
 2014-12-02 18:54:11 +00:00
PauloftheWest
99348d6911 am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev 
* commit 'da02111f16b7d2b09fb447342a9aa4640c75a117':
  Added color to Data Usage graph
 2014-12-02 18:04:43 +00:00
PauloftheWest
f28bd65462 am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 
* commit 'fc6a8bf2d729ad21fa8d7622f580401db351c269':
  Fixed a Wi-Fi dialog crash
 2014-12-02 18:04:42 +00:00
PauloftheWest
da02111f16 Merge "Added color to Data Usage graph" into lmp-mr1-dev 2014-12-02 17:58:47 +00:00
PauloftheWest
fc6a8bf2d7 Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 2014-12-02 17:58:24 +00:00
PauloftheWest
21316f1d1a am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev 
* commit '41c2962552b750a8e5fa07f283ba2b72b36d2298':
  Remove extraneous SIM status information
 2014-12-02 17:56:08 +00:00
PauloftheWest
41c2962552 Merge "Remove extraneous SIM status information" into lmp-mr1-dev 2014-12-02 17:50:31 +00:00
Sanket Padawe
bcbe980986 New activity for enabling tethering using Quick Settings 
Added a new activity which would handle tethering on clicking Tethering
tile of Quick Settings.

Bug: 18368949
Change-Id: I77057f3ccd26263831ba88e426b5f8d3ad1fa788
 2014-12-02 09:45:35 -08:00
Zoltan Szatmary-Ban
546790c1ed Show account icons for managed profiles on Settings > Factory Reset 
Fixing a bug where managed profile's accounts where shown without
the account icon.

Bug: 18555032
Change-Id: I5a1094e795b31a00599bc4df413573030693b436
 2014-12-02 17:22:10 +00:00
Maurice Lam
ecd2b7b81f [FRP] Theme interstitials for lock screen setup 
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.

Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
 2014-12-01 20:24:08 -08:00
Maurice Lam
a2caf6332f am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 
* commit '1dce16a61c65ec9c1dd870edbd6dd3ef5d7ca703':
  [WifiSetup] Swap buttons position in Skip dialog
 2014-12-02 03:06:02 +00:00
Maurice Lam
1dce16a61c Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 2014-12-02 02:59:10 +00:00
Lucky Zhang
3bcea0289b [FRP] Show FRP warning when disabling secure unlock 
Added a dialog fragment to display warning message about disabling
device protection features when changing from a secure unlock
method to an insecure one.

Bug: 18509782
Change-Id: I0eaa9ff55c14092d8b3361d10da8b4530dd79bee
 2014-12-01 18:49:10 -08:00
Maurice Lam
86f184b3d6 am 6b19fa90: [FRP] Theming for Pattern and Password screens 
* commit '6b19fa9017800b94c75238339a337fd8f6c3e808':
  [FRP] Theming for Pattern and Password screens
 2014-12-02 01:04:39 +00:00
Maurice Lam
6b19fa9017 [FRP] Theming for Pattern and Password screens 
Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.

This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.

Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a
 2014-12-01 16:18:27 -08:00
Maurice Lam
ab4fb49ab1 [WifiSetup] Swap buttons position in Skip dialog 
According to material-spec, buttons that keep users in the same
screen should be on the left (negative button) while button that
intorduce changes should be on the right, even if the action is
destructive.

Bug: 18542108
Change-Id: I335f83c6bb810cd43aeda28566baacea39435c57
 2014-12-01 12:09:10 -08:00
Sanket Padawe
7666b547bf Fixed improper capitalization related to trademark term in BT 
Bug: 18362051
Change-Id: I3074e120a5b261fbcb5d429bae47d233ad6fd695
 2014-12-01 19:53:53 +00:00
John Spurlock
647bb8ff75 am c868f703: Settings: Improve inline volume sliders. 
* commit 'c868f7035a6d05332b3d8afcde2ae27ad0413e79':
  Settings: Improve inline volume sliders.
 2014-12-01 17:11:23 +00:00
John Spurlock
c868f7035a Settings: Improve inline volume sliders. 
- Track framework changes to show mute states for non-ringer streams
 - Update vibrate icon in sync with other system components.

Depends on:
  Ie2df52edb070055ef59c74039162a0e785d2fdbb

Bug: 17899613
Change-Id: Ib38c86600693e0f36fe72deb231ea751e0486af7
 2014-12-01 11:58:25 -05:00
John Spurlock
c5c0edae58 am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev 
* commit '7da7c2220d3a30fb3a1b57ee95caa9aec860a132':
  Settings: Restart volumizers explicitly on resume.
 2014-12-01 15:04:03 +00:00