Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,802 Commits 1 Branch 0 Tags
5c416a6bf09fe5f97a434e20d64496ed6fc857d1
Commit Graph

14802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
PauloftheWest
28fc05a12b Merge "Added SIM Card Activity to Settings" into lmp-dev 2014-07-24 15:35:58 +00:00
John Spurlock
384ad06ec0 am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev 
* commit 'a8e0a5b5f9a1d9fbade91909d57eb431fed69a86':
  Settings: Add to the zen alarm string.
 2014-07-24 15:31:02 +00:00
Paul Lawrence
741bad53a0 am e68f5224: Show correct string when prompting for pattern before encrypting 
* commit 'e68f5224e4359aef7f62c94130d5b9b221bee389':
  Show correct string when prompting for pattern before encrypting
 2014-07-24 15:15:09 +00:00
Paul Lawrence
e68f5224e4 Show correct string when prompting for pattern before encrypting 
Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
 2014-07-24 15:11:16 +00:00
PauloftheWest
3815561997 Added SIM Card Activity to Settings 
+ Added SIM Card menu to Settings menu
+ Added SIM card detail dialog when selecting a SIM Card
+ Added ability to select the default SIM for Cellular data, Calls, and SMS

Bug: 16241745

Change-Id: I43437aa4c591c5097a8865d564f88726671e1b7d
 2014-07-24 06:41:12 -07:00
Alexandra Gherghina
214712dda0 am 2513851a: Adds cross-profile intents for Settings screens. 
* commit '2513851ace8d353f99146316b81a430add6d837f':
  Adds cross-profile intents for Settings screens.
 2014-07-24 12:51:08 +00:00
Alexandra Gherghina
2513851ace Adds cross-profile intents for Settings screens. 
This is needed for settings that are handled in the primary profile app.

Bug: 16369104
Change-Id: If3ec3866778282219267481b8f419774f7f2c9de
 2014-07-24 13:45:52 +01:00
Alexandra Gherghina
2a459d3008 am 377b8df3: Merge "Checks if the right user has a restriction" into lmp-dev 
* commit '377b8df3ed89f2e61b6755aee8136754a2edf9c5':
  Checks if the right user has a restriction
 2014-07-24 12:27:14 +00:00
Baligh Uddin
f165e120ba Import translations. DO NOT MERGE 
Change-Id: Ife340467faf89de06d9f21c3331ad7ccae209635
Auto-generated-cl: translation import
 2014-07-24 03:02:05 -07:00
Fabrice Di Meglio
e2953d9f5f am 76f5c3bc: Merge "More code cleaning for the Home intent filters" into lmp-dev 
* commit '76f5c3bc722b7450870c586bffef1688e96607b7':
  More code cleaning for the Home intent filters
 2014-07-24 02:41:04 +00:00
Fabrice Di Meglio
d2f47cc243 am 87915ea0: Merge "Code cleaning" into lmp-dev 
* commit '87915ea074c62b591a2f9967c57ab21412c6cae8':
  Code cleaning
 2014-07-24 02:10:29 +00:00
Fabrice Di Meglio
e0c5dd0797 am 456229cc: Merge "Fix how Home Activities are refreshed" into lmp-dev 
* commit '456229ccdfb6ddb8cd1ac3be939e1c2221f4bedd':
  Fix how Home Activities are refreshed
 2014-07-24 01:31:21 +00:00
Fabrice Di Meglio
b90ce51c3d am 1e9405b5: Merge "Add Settings Dashboard refresh for Home activities" into lmp-dev 
* commit '1e9405b5cc35d598507fccdfa0e833ab83b2cfd9':
  Add Settings Dashboard refresh for Home activities
 2014-07-23 23:35:57 +00:00
Jim Miller
18be821aca am dfd2c6f2: Change wording in keyguard settings menu. 
* commit 'dfd2c6f261df4d5de5111524bd6205406d0e72db':
  Change wording in keyguard settings menu.
 2014-07-23 23:23:58 +00:00
Jim Miller
dfd2c6f261 Change wording in keyguard settings menu. 
Fixes bug 15167729

Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc
 2014-07-23 23:20:33 +00:00
Maurice Lam
7fbde72593 am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev 
* commit '56d781b32b7aad0fb0bb41aae26ce896f1fedfdc':
  [WifiSetup] Tablet landscape layout
 2014-07-23 23:03:29 +00:00
Fabrice Di Meglio
fd45a5c635 am 56fc6a75: Merge "Code cleaning for Index" into lmp-dev 
* commit '56fc6a75302c8525e45d6898901f45b0de526944':
  Code cleaning for Index
 2014-07-23 22:44:41 +00:00
PauloftheWest
9c982871c7 am dc5db975: am ac1dedaf: am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev 
* commit 'dc5db975aaae95ec4e27d48b7748364692afa2b9':
  Fixed bug where multiple access points would show connected
 2014-07-23 22:04:54 +00:00
PauloftheWest
dc5db975aa am ac1dedaf: am d89febb6: Merge "Fixed bug where multiple access points would show connected" into lmp-dev 
* commit 'ac1dedafa197624568b6959c5b497b877791d9dc':
  Fixed bug where multiple access points would show connected
 2014-07-23 22:00:48 +00:00