Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,821 Commits 1 Branch 0 Tags
4ad7fa45e459f89907032accc49136d0bf007e98
Commit Graph

14821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
4ad7fa45e4 am 30765f49: (-s ours) am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '30765f497de684d72287fd26e1cc9696f8ac9617':
  Import translations. DO NOT MERGE
 2014-07-24 23:41:31 +00:00
Paul Lawrence
5a67abbbdd am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 
* commit 'a6ce40f461672fdbfef611bfcc90a7578b18b70c':
  Show countdown of remaining decrypt attempts before wiping device
 2014-07-24 23:41:30 +00:00
Fabrice Di Meglio
479f70cd02 am c79ba3b8: am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 
* commit 'c79ba3b870048e9e0fd57a232bf5de71615735cd':
  Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
 2014-07-24 23:41:29 +00:00
Adam Lesinski
9bac84340b am 44b0c71d: am 2c276024: am 468d3916: Implement the Usage Access Settings UI 
* commit '44b0c71d1399ba24c2b85ae3272d97fcc3c854f5':
  Implement the Usage Access Settings UI
 2014-07-24 23:41:29 +00:00
PauloftheWest
5c416a6bf0 am bd1403f8: am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev 
* commit 'bd1403f85079958132427f523ee738ade98ca0f6':
  Added SIM Card Activity to Settings
 2014-07-24 23:41:27 +00:00
PauloftheWest
e774c8866b am 38b2a89e: am ff455f40: am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev 
* commit '38b2a89ee06d1eba67e5c13e76d9ca22b41125b5':
  Fixed an illustrious NullPointer bug on Wifi Assistant
 2014-07-24 23:41:26 +00:00
John Spurlock
159af1cb3f am 06fbbf6f: am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev 
* commit '06fbbf6f313c161980f2d28d81b19942a9adb306':
  Settings: Add to the zen alarm string.
 2014-07-24 23:41:25 +00:00
Paul Lawrence
67a588bc43 am 40b8f460: am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting 
* commit '40b8f46072ad242fc420d922cffb83b082e84894':
  Show correct string when prompting for pattern before encrypting
 2014-07-24 23:41:24 +00:00
Alexandra Gherghina
8061efef1e am 6b68dba3: am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens. 
* commit '6b68dba3b0721a5688e3933089b5879f1c804e12':
  Adds cross-profile intents for Settings screens.
 2014-07-24 23:41:24 +00:00
Alexandra Gherghina
a5476113d4 am 26e2f3ac: am 2a459d30: am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev 
* commit '26e2f3acff6ffb814d0d839a96e0917f4ea5c8e1':
  Checks if the right user has a restriction
 2014-07-24 23:41:23 +00:00
Baligh Uddin
30765f497d am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c8f4e83de27af48cef4e49fd536e9fef3374c841':
  Import translations. DO NOT MERGE
 2014-07-24 23:36:02 +00:00
Paul Lawrence
a6ce40f461 am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 
* commit '4ea43465fa12efbe064f24d583a39409caa3cf3d':
  Show countdown of remaining decrypt attempts before wiping device
 2014-07-24 23:36:02 +00:00
Fabrice Di Meglio
c79ba3b870 am 997e93cc: am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 
* commit '997e93cca483985d31236d66023bc83e24154ba1':
  Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
 2014-07-24 23:35:32 +00:00
Adam Lesinski
44b0c71d13 am 2c276024: am 468d3916: Implement the Usage Access Settings UI 
* commit '2c27602438ce8a1d39c856e834b6405aa96d3218':
  Implement the Usage Access Settings UI
 2014-07-24 23:34:45 +00:00
PauloftheWest
bd1403f850 am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev 
* commit '742dd6d40603c424a161c68d70828180cf334533':
  Added SIM Card Activity to Settings
 2014-07-24 23:34:36 +00:00
PauloftheWest
38b2a89ee0 am ff455f40: am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev 
* commit 'ff455f40b6ed9f3781d5ea58be7d66c74e94a77c':
  Fixed an illustrious NullPointer bug on Wifi Assistant
 2014-07-24 23:33:57 +00:00
John Spurlock
06fbbf6f31 am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev 
* commit '384ad06ec0357e8e9c7915f66d6795d6f9ba2819':
  Settings: Add to the zen alarm string.
 2014-07-24 23:31:18 +00:00
Paul Lawrence
40b8f46072 am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting 
* commit '741bad53a060700b639f4a061e0f63702224bb39':
  Show correct string when prompting for pattern before encrypting
 2014-07-24 23:31:06 +00:00
Alexandra Gherghina
6b68dba3b0 am 214712dd: am 2513851a: Adds cross-profile intents for Settings screens. 
* commit '214712dda0a9ecea1af609b0e1029cbf627e73aa':
  Adds cross-profile intents for Settings screens.
 2014-07-24 23:30:49 +00:00
Alexandra Gherghina
26e2f3acff am 2a459d30: am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev 
* commit '2a459d300850d98adf5d2d47f051e9a17d7c669e':
  Checks if the right user has a restriction
 2014-07-24 23:30:48 +00:00
Baligh Uddin
c8f4e83de2 am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
  Import translations. DO NOT MERGE
 2014-07-24 21:52:43 +00:00
Paul Lawrence
4ea43465fa am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 
* commit '832ad7206299be6db94e82e2387c0fcf8df53e7e':
  Show countdown of remaining decrypt attempts before wiping device
 2014-07-24 21:52:43 +00:00
Fabrice Di Meglio
997e93cca4 am 6cef9d23: Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 
* commit '6cef9d23b8572d8bd87329999f10286e29a861c0':
  Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS
 2014-07-24 21:26:47 +00:00
Baligh Uddin
c3bd8097d8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
Baligh Uddin
1de9e58b20 Import translations. DO NOT MERGE 
Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import
 2014-07-24 21:44:52 +00:00
Paul Lawrence
832ad72062 Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev 2014-07-24 20:48:02 +00:00
Adam Lesinski
2c27602438 am 468d3916: Implement the Usage Access Settings UI 
* commit '468d39160fd417cf23cba3d592acb349d3f59c55':
  Implement the Usage Access Settings UI
 2014-07-24 20:30:37 +00:00
Adam Lesinski
468d39160f Implement the Usage Access Settings UI 
Scans for apps requesting permission to use the
UsageStats API and displays them so that the user
can grant or deny access.

Bug: 16461070

Change-Id: Ie9f611688581cdd60ffe9f59e566f658ac2564e9
 2014-07-24 13:24:19 -07:00
PauloftheWest
742dd6d406 am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev 
* commit '28fc05a12bc26c79be697c347dd2930094900744':
  Added SIM Card Activity to Settings
 2014-07-24 20:02:57 +00:00
Fabrice Di Meglio
459baaa9f5 am e2953d9f: am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev 
* commit 'e2953d9f5fcee4cb4d84911e3e7e0f75c521bfb2':
  More code cleaning for the Home intent filters
 2014-07-24 19:48:10 +00:00
Fabrice Di Meglio
24d06e1da4 am d2f47cc2: am 87915ea0: Merge "Code cleaning" into lmp-dev 
* commit 'd2f47cc243ae64568f737023e450b03a40ea72c5':
  Code cleaning
 2014-07-24 19:47:58 +00:00
Fabrice Di Meglio
0a1732f961 am e0c5dd07: am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev 
* commit 'e0c5dd07979b57940264f1b72957bd84ecb88740':
  Fix how Home Activities are refreshed
 2014-07-24 19:47:30 +00:00
Fabrice Di Meglio
482bcaf107 am b90ce51c: am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev 
* commit 'b90ce51c3dd222cc761d5bd01ffff2039b976224':
  Add Settings Dashboard refresh for Home activities
 2014-07-24 19:46:30 +00:00
Jim Miller
ab2b852cee am 18be821a: am dfd2c6f2: Change wording in keyguard settings menu. 
* commit '18be821acacd14cd7e8425c53095e8a2f4bd2b69':
  Change wording in keyguard settings menu.
 2014-07-24 19:46:26 +00:00
Maurice Lam
66336045c4 am 7fbde725: am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev 
* commit '7fbde72593b42d452ac492c00845b097efa8f0b4':
  [WifiSetup] Tablet landscape layout
 2014-07-24 19:46:24 +00:00
Fabrice Di Meglio
3e55211042 am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev 
* commit 'fd45a5c6352d734b7cf27e8da6e6f133f364612c':
  Code cleaning for Index
 2014-07-24 19:46:08 +00:00
PauloftheWest
ff455f40b6 am 958d1ee6: Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev 
* commit '958d1ee6d584b7489d57071305c44635a0534ba9':
  Fixed an illustrious NullPointer bug on Wifi Assistant
 2014-07-24 18:51:10 +00:00
Paul Lawrence
bd4c3210e1 Show countdown of remaining decrypt attempts before wiping device 
Bug: 16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12
 2014-07-24 08:38:24 -07:00
PauloftheWest
958d1ee6d5 Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev 2014-07-24 15:36:14 +00:00
PauloftheWest
63a1affdae Fixed an illustrious NullPointer bug on Wifi Assistant 
+ The class was never instantiated...

Bug: 16543506
Change-Id: I00882df31ee986116b8fa28a54796bb3b20f2e2b
 2014-07-24 11:45:22 -07:00
Fabrice Di Meglio
6cef9d23b8 Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev 2014-07-24 15:36:02 +00:00
Fabrice Di Meglio
e3ff4d8e92 Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS 
- make it work again (what a code...)

Change-Id: Ic71d8e40ff8a5e0c663fd40655e4f4cc31bc8caf
 2014-07-24 14:07:02 -07:00
Baligh Uddin
d0264a35e4 Merge "Import translations. DO NOT MERGE" 2014-07-24 15:35:58 +00:00
Fabrice Di Meglio
9bf0ca9f2a am 459baaa9: am e2953d9f: am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev 
* commit '459baaa9f577a8ec641eca3581ab523b2cd4f695':
  More code cleaning for the Home intent filters
 2014-07-24 20:00:00 +00:00
Fabrice Di Meglio
3cd4e5625c am 24d06e1d: am d2f47cc2: am 87915ea0: Merge "Code cleaning" into lmp-dev 
* commit '24d06e1da4a1c85574ae814e44aef9ef236f7c08':
  Code cleaning
 2014-07-24 20:00:00 +00:00
Fabrice Di Meglio
ccf4cf33f7 am 0a1732f9: am e0c5dd07: am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev 
* commit '0a1732f9611f5099554bdc61c376556d33302949':
  Fix how Home Activities are refreshed
 2014-07-24 19:59:55 +00:00
Fabrice Di Meglio
74c842d31a am 482bcaf1: am b90ce51c: am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev 
* commit '482bcaf10769cf1725e60dd76da8bcd358faa5c7':
  Add Settings Dashboard refresh for Home activities
 2014-07-24 19:59:53 +00:00
Jim Miller
5d12af524f am ab2b852c: am 18be821a: am dfd2c6f2: Change wording in keyguard settings menu. 
* commit 'ab2b852cee8a178097b34d42d5482fecd638414f':
  Change wording in keyguard settings menu.
 2014-07-24 19:59:52 +00:00
Maurice Lam
4548c34ece am 66336045: am 7fbde725: am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev 
* commit '66336045c461a1ce32855b50a150b91bd2c569cc':
  [WifiSetup] Tablet landscape layout
 2014-07-24 19:59:51 +00:00
Fabrice Di Meglio
4be6250bee am 3e552110: am fd45a5c6: am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev 
* commit '3e552110423393020d589998bf21696f3924585a':
  Code cleaning for Index
 2014-07-24 19:59:50 +00:00