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

17538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
0b83adacfc am 9b1ac239: am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev 
* commit '9b1ac239cdad62de8dab458cec40eb752593dc9b':
  Show account icons for managed profiles on Settings > Factory Reset
 2014-12-03 20:42:04 +00:00
Sanket Padawe
09d2676cab am fc82a3de: am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev 
* commit 'fc82a3dea618a71d792a709d4f3580598aca2545':
  Fixed improper capitalization related to trademark term in BT
 2014-12-03 20:40:06 +00:00
Sanket Padawe
3bae72459f am 5fe69a2c: am 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev 
* commit '5fe69a2cfd9487d71b50aface7c6670f5ac64ace':
  New activity for enabling tethering using Quick Settings
 2014-12-03 20:40:05 +00:00
Sanket Padawe
b58859a723 am 408f0a29: am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev 
* commit '408f0a29547a4e2d1ebfc828dea52133788f10a6':
  Fixed crash in sim settings due to wrong toString() call.
 2014-12-03 20:40:04 +00:00
Sanket Padawe
4633e152c8 am 9e878b1b: am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev 
* commit '9e878b1b3a32388f82ba6c2c75343d8d04f6cb7c':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.
 2014-12-03 20:40:03 +00:00
Maurice Lam
2ecc0107dc am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 
* commit '94c85309b297e5c63d54b9a76f27e9119779411e':
  [FRP] Theme interstitials for lock screen setup
 2014-12-03 20:40:02 +00:00
Baligh Uddin
38fa4d01c5 am 47be93e9: (-s ours) am 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '47be93e97a238cb02766517d554ea704e72731fc':
  Import translations. DO NOT MERGE
 2014-12-03 20:40:01 +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
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
23ab054dd9 am 955f412c: am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev 
* commit '955f412c4ba854c965f2aaf7ba96b4cda43b99b9':
  [FRP] Show FRP warning when disabling secure unlock
 2014-12-03 00:01:31 +00: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
50bbce7713 am cbf347c4: am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev 
* commit 'cbf347c42d06e27785ccde70763a2c4dbc45542d':
  Changed SIM lock toggle to a switch
 2014-12-02 21:34:58 +00: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
b07cd34315 am 3fd2fa7b: am 003aee5f: Merge "Bug Fix: SIM Status will display the proper network type" into lmp-mr1-dev 
* commit '3fd2fa7b96a72f63afd9e4495fde4d31fa42edd5':
  Bug Fix: SIM Status will display the proper network type
 2014-12-02 20:15:25 +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
eeaf8608d3 am 04f2391d: am 61066c13: Merge "[New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API" into lmp-mr1-dev 
* commit '04f2391d17ce994b6d1da5907c7b5010621091b2':
  [New RemoveAccount API in Settings App]: Modify Settings app to use the new account remove API
 2014-12-02 19:31:26 +00: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
96ba998a0b am 99348d69: am da02111f: Merge "Added color to Data Usage graph" into lmp-mr1-dev 
* commit '99348d6911ec15d9a93a2ce72b9c276929789499':
  Added color to Data Usage graph
 2014-12-02 18:12:22 +00:00
PauloftheWest
c33b2ee31a am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 
* commit 'f28bd654620102de2408383b9bba5114a9556267':
  Fixed a Wi-Fi dialog crash
 2014-12-02 18:12:21 +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
506607d1f8 am 21316f1d: am 41c29625: Merge "Remove extraneous SIM status information" into lmp-mr1-dev 
* commit '21316f1d1aedaffbd9f882f4cecdf518e8521212':
  Remove extraneous SIM status information
 2014-12-02 18:04:15 +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
62009bf856 am a2caf633: am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev 
* commit 'a2caf6332f2b55e1480724d025ffb7592dcd13f7':
  [WifiSetup] Swap buttons position in Skip dialog
 2014-12-02 03:12:18 +00:00