Commit Graph

17849 Commits

Author SHA1 Message Date
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
Geoff Mendal
dfa34df936 Import translations. DO NOT MERGE
Change-Id: I09102039883ee5ee63f0f58f26ea2a2239b8d047
Auto-generated-cl: translation import
2014-12-03 12:39:08 -08:00
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
PauloftheWest
e51465254d Fixed a SimSettings issue
+ SimSettings will not automatically select the first SIM for the user.

Bug: 18528013
Change-Id: I4c2024860231f6124a801feda821bc16bc2c4772
2014-12-03 10:16:52 -08: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
David Turner
e6af93277c Merge "Fix Settings app crash for devices with no USB support." 2014-12-03 10:46:31 +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
Fyodor Kupolov
cfae855d67 Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED
Added BroadcastReceiver for ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED to
refresh the list, if event has been received. It could be that checkboxes
need to be updated. Also disable the checkbox while admin is being removed.

Bug: 17609838
Change-Id: Id1f72c27111c280a77a03ba6ba26bcdbbb10bb58
2014-12-02 17:24:13 -08:00
Wink Saville
fcec91f475 Change initMobileTabTag to use subInfoList
Also add additional debug.

Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
2014-12-02 17:12:08 -08: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
PauloftheWest
ffef98b3a0 Add SIM notification pop-ups.
+ Added a SimDialogActivity so any application can iniate a request to
se tthe default Data, Calls, and SMS.

Bug: 18293625
Change-Id: I60535125b40ece5ebc14542d732e4493bddefbae
2014-12-02 16:35:32 -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