Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 1 Branch 0 Tags
5514509963b7d09cbb7d893d110afbc91814a7e4
Commit Graph

18608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
5514509963 Remove Users & profiles header for phones 
In Settings/Users, remove "Users & profiles" header is no longer displayed
for phones. List of UserPreference is now explicitly sorted. Before, it
was relying on an overridden compareTo method in UserPreference, which
behavior was difficult to predict when instances of UserPreference were
mixed with other instances in the same group.

Bug:17630523
Change-Id: Iba1ef863c2cd4e8ca307ae0aa0877c5cd9e0973d
 2014-12-17 13:58:01 -08:00
PauloftheWest
a754c6ba05 am d831733f: am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit 'd831733fabc672842e5519d724c05c8b835824b6':
  Fixed a Settings crash when entering SIM status
 2014-12-05 19:21:45 +00:00
PauloftheWest
d831733fab am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit '651474d0275f9d7cd10cdd6e0afb7dd107e66335':
  Fixed a Settings crash when entering SIM status
 2014-12-05 19:12:44 +00:00
Sanket Padawe
9a73365ed7 am 76fd9d62: am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '76fd9d62facb2c683b69c2e4280534abdb2281bd':
  Removed unnecessary heading in Sim settings
 2014-12-05 16:26:39 +00:00
Sanket Padawe
76fd9d62fa am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '669d4e4fce68d3f8e6391fab5d4e60e358234767':
  Removed unnecessary heading in Sim settings
 2014-12-05 15:52:03 +00:00
Geoff Mendal
94eb04617f am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'eb5b7721df47a601d3707a7bcbf32d61efe09c5b':
  Import translations. DO NOT MERGE
 2014-12-05 00:14:20 +00:00
Amith Yamasani
0c8a2d63be am a7ddb536: am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit 'a7ddb536fd9ed69f8436f1f786ca576fd34effa3':
  Fix padding in user type selection dialog
 2014-12-05 00:14:14 +00:00
Maurice Lam
7b6801af7c am 73a68c07: am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit '73a68c0727fbc2caa85109eea17e2b583c5905c1':
  [FRP] Transitions for lock screen setup
 2014-12-05 00:14:13 +00:00
Wink Saville
05e3147192 am 527c7dbc: am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '527c7dbcc74a79b18c0c82a9778da49ba894e56d':
  Change initMobileTabTag to use subInfoList
 2014-12-05 00:14:11 +00:00
PauloftheWest
2b2019255e am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev 
* commit '753a00e057201ad319bf85487beb1c6329bf1a05':
  Add SIM notification pop-ups.
 2014-12-05 00:14:10 +00:00
Geoff Mendal
eb5b7721df am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e21824491ee47ecc35376b9fd909a07416276f29':
  Import translations. DO NOT MERGE
 2014-12-04 21:47:16 +00:00
Amith Yamasani
a7ddb536fd am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit '53e8940b94a7b508659b84fd9037f922f1d4a50f':
  Fix padding in user type selection dialog
 2014-12-04 21:47:15 +00:00
Maurice Lam
73a68c0727 am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit '45f44ad7e31b3ef8f4e3f4b5bd43cc215e712b9f':
  [FRP] Transitions for lock screen setup
 2014-12-04 21:47:14 +00:00
Wink Saville
527c7dbcc7 am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '0d8027cedcea809d925af5a19590388e8b4945d0':
  Change initMobileTabTag to use subInfoList
 2014-12-04 21:47:13 +00:00
PauloftheWest
753a00e057 am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev 
* commit '06ddf97c4da204e62a5427c8e22643c267c1d9ed':
  Add SIM notification pop-ups.
 2014-12-04 21:47:11 +00:00
Geoff Mendal
1324cb3561 am b8fcb473: (-s ours) am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b8fcb473e499ed160ee24cccdba73002a73977e3':
  Import translations. DO NOT MERGE
 2014-12-04 20:46:08 +00:00
Geoff Mendal
b8fcb473e4 am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a37526a6829c24abfac6fc21b41225f7ee11e756':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:52 +00:00
PauloftheWest
651474d027 am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 
* commit '4d7a6248587500f336834dce6e2f11fe078bf106':
  Fixed a Settings crash when entering SIM status
 2014-12-04 18:30:26 +00:00
PauloftheWest
4d7a624858 Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev 2014-12-04 18:25:34 +00:00
Sanket Padawe
669d4e4fce am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 
* commit '91a4deb5e9cc957918c2e27e509300f3015c72d6':
  Removed unnecessary heading in Sim settings
 2014-12-04 18:19:11 +00:00
Sanket Padawe
91a4deb5e9 Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev 2014-12-04 18:12:41 +00:00
PauloftheWest
7fa2415492 Fixed a Settings crash when entering SIM status 
Bug: 18596763
Change-Id: I699268345c342be05814bb531027dd53cba1c370
 2014-12-04 10:09:28 -08:00
David 'Digit' Turner
6a93406b33 am 5e883b3b: Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit '5e883b3b37e7203f712174ed46b7a04eb19ea3da':
  Fix Settings app crash for devices with no USB support.
 2014-12-04 16:17:39 +00:00
John Spurlock
39ccb47342 am 24f17f0b: am f29bc1df: am 45893e65: Settings: Don\'t lose the switch bar returning to saver settings. 
* commit '24f17f0b94341c84ca017598089bdb52e44e1f6a':
  Settings: Don't lose the switch bar returning to saver settings.
 2014-12-04 16:16:42 +00:00
Geoff Mendal
e21824491e am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3f5fd1febae34976bdc3f03b44eaec99bbf9703b':
  Import translations. DO NOT MERGE
 2014-12-04 15:17:53 +00:00
Amith Yamasani
53e8940b94 am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 
* commit '6ff07c418ff171296e763a6658fe4b7f49e12871':
  Fix padding in user type selection dialog
 2014-12-04 15:17:52 +00:00
Maurice Lam
45f44ad7e3 am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 
* commit 'a3dff74e59b29fdff63810e55c27207a8354c935':
  [FRP] Transitions for lock screen setup
 2014-12-04 15:17:51 +00:00
Wink Saville
0d8027cedc am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 
* commit '98a35726522899efab19bafeff331b0f77553e89':
  Change initMobileTabTag to use subInfoList
 2014-12-04 15:17:50 +00:00
PauloftheWest
06ddf97c4d am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-dev 
* commit 'e8a868f26616f59206eba19c0b08ad4c99882b8c':
  Add SIM notification pop-ups.
 2014-12-04 15:17:48 +00:00
David 'Digit' Turner
5e883b3b37 Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-12-04 09:13:41 +00:00
David 'Digit' Turner
111a62edab resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp 
Change-Id: I53d46554c11b4d67b84cc713b88a09a28a79db4c
 2014-12-04 10:12:29 +01:00
Geoff Mendal
63042047d4 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:51:22 +00:00
Geoff Mendal
a37526a682 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-04 05:48:32 +00:00
Geoff Mendal
3f5fd1feba Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-04 05:46:51 +00:00
Amith Yamasani
6ff07c418f Merge "Fix padding in user type selection dialog" into lmp-mr1-dev 2014-12-04 01:50:05 +00:00
Maurice Lam
a3dff74e59 Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-dev 2014-12-04 00:25:23 +00:00
Maurice Lam
784f02720e [FRP] Transitions for lock screen setup 
Use the slide transition for activities using the setup theme.

Bug: 18482708
Change-Id: I1a60a24f426118a63ec219bfbb378f255f362fa7
 2014-12-03 16:18:13 -08:00
Wink Saville
98a3572652 Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-dev 2014-12-03 23:33:01 +00:00
PauloftheWest
e8a868f266 Merge "Add SIM notification pop-ups." into lmp-mr1-dev 2014-12-03 23:30:53 +00:00
Sanket Padawe
3b72ead136 Removed unnecessary heading in Sim settings 
Bug: 17321738
Change-Id: If60d5539e67ca0f57b4d4fc62cb55118f8e0d3b2
 2014-12-03 15:23:14 -08:00
Amith Yamasani
f3db021ba5 Fix padding in user type selection dialog 
Use preferred list item padding for the list items
and use the dialog context for creating the adapter.

Bug: 18509286
Change-Id: Ia5791a6283723a0ab458f24ec22b8890ab627657
 2014-12-03 14:20:05 -08:00
Alexandra Gherghina
5d66a9d6a0 am 9d4d02b2: am 7b7966e5: am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev 
* commit '9d4d02b254fc46881f69ce46c80c9824100c123e':
  Modify account settings for better locale resolution
 2014-12-03 21:52:32 +00:00
Zoltan Szatmary-Ban
bedf4a279e am 0b83adac: am 9b1ac239: am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev 
* commit '0b83adacfc8ea9da75b081220245a15c005b9aa9':
  Show account icons for managed profiles on Settings > Factory Reset
 2014-12-03 21:52:30 +00:00
Sanket Padawe
c88fab28b2 am 09d2676c: am fc82a3de: am ef4d1791: Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev 
* commit '09d2676cab013c4b7e4352c8d956ebf0436ad631':
  Fixed improper capitalization related to trademark term in BT
 2014-12-03 21:52:29 +00:00
Sanket Padawe
3bbfa7b355 am 3bae7245: am 5fe69a2c: am 97c65a5e: Merge "New activity for enabling tethering using Quick Settings" into lmp-mr1-dev 
* commit '3bae72459f352b60893955a5b3c23614ca9c8403':
  New activity for enabling tethering using Quick Settings
 2014-12-03 21:52:28 +00:00
Sanket Padawe
a19309eaf8 am b58859a7: am 408f0a29: am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev 
* commit 'b58859a72345c13f332f2bf6ace3fb52f02bf258':
  Fixed crash in sim settings due to wrong toString() call.
 2014-12-03 21:52:26 +00:00
Sanket Padawe
717c872ad3 am 4633e152: am 9e878b1b: am 430e01d0: Merge "Fixing "SMS Messages" to "SMS messages" as per UX requirement." into lmp-mr1-dev 
* commit '4633e152c80ac60f83e2e0d0db3e3b93d6928c66':
  Fixing "SMS Messages" to "SMS messages" as per UX requirement.
 2014-12-03 21:52:25 +00:00
Maurice Lam
ec957dfcf7 am 2ecc0107: am 94c85309: am 7b484b9a: Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 
* commit '2ecc0107dcc939bd4e3b9f4c4359f9845cae1b82':
  [FRP] Theme interstitials for lock screen setup
 2014-12-03 21:52:23 +00:00
Baligh Uddin
e124d394d1 am 38fa4d01: (-s ours) am 47be93e9: (-s ours) am 18701587: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '38fa4d01c5ce9981026386d7328aab0c32fe7eb8':
  Import translations. DO NOT MERGE
 2014-12-03 21:52:22 +00:00
Geoff Mendal
4c40383885 Import translations. DO NOT MERGE 
Change-Id: Ic22c5b6d3187254593d57008979abaad26fd5c3d
Auto-generated-cl: translation import
 2014-12-03 13:01:49 -08:00