Commit Graph

10944 Commits

Author SHA1 Message Date
Amith Yamasani
4b5a5b7591 Remove extra padding in restrictions screen
Change-Id: Ib45d3161d9f569ba8eadf3abe4001b3047c92b74
2013-07-22 11:22:16 -07:00
Baligh Uddin
a2238e794d Import translations. DO NOT MERGE
Change-Id: I090c37ae4557c04d92abb148272638d634631545
Auto-generated-cl: translation import
2013-07-22 11:13:41 -07:00
Baligh Uddin
dd00b6b013 Import translations. DO NOT MERGE
Change-Id: I8c68608b9494ea120e4620cfa3c0027298c0082a
Auto-generated-cl: translation import
2013-07-22 11:10:07 -07:00
Baligh Uddin
6b939fe2c8 Import translations. DO NOT MERGE
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
2013-07-22 11:08:10 -07:00
Satoshi Kataoka
a5c08c9a6f Remove the locale spinner and show the current language
Bug: 8976598
Change-Id: I092141d0cc5c6d7af499ab8ceb69275923180e37
2013-07-22 16:34:41 +09:00
Baligh Uddin
f948ecdc61 am 50212d6c: (-s ours) am a4a2194a: am 68b87505: Import translations. DO NOT MERGE
* commit '50212d6c5528de767be224a3b68f736ed3cbf65b':
  Import translations. DO NOT MERGE
2013-07-19 16:02:37 -07:00
Baligh Uddin
ea9c15927d am 8d9e3eb0: (-s ours) am 8180a3a8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '8d9e3eb05fc0d39e39ec2fc9ad9233adb23eecb3':
  Import translations. DO NOT MERGE
2013-07-19 16:02:35 -07:00
The Android Open Source Project
ad8b4b7250 am 58311f90: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '58311f908300bff0174f84d06116225c5d985107':
  Use ConnectivityManager for mobile provision url
2013-07-19 16:02:29 -07:00
Robert Greenwalt
ff303b4f81 am ea6b5d63: am 275c1dff: am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit 'ea6b5d63d9100f014cdedf438f1750ed65b822b2':
  Use ConnectivityManager for mobile provision url
2013-07-19 16:02:13 -07:00
Baligh Uddin
50212d6c55 am a4a2194a: am 68b87505: Import translations. DO NOT MERGE
* commit 'a4a2194a2f4beb9f29a96249e4b3b2a4f9e80c96':
  Import translations. DO NOT MERGE
2013-07-19 15:18:54 -07:00
Baligh Uddin
a4a2194a2f am 68b87505: Import translations. DO NOT MERGE
* commit '68b87505548be6e6734d4cfe90c450b243950455':
  Import translations. DO NOT MERGE
2013-07-19 15:16:17 -07:00
Baligh Uddin
8d9e3eb05f am 8180a3a8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '8180a3a86a36a7b9ed463f2f162e82ac06a9f1c4':
  Import translations. DO NOT MERGE
2013-07-19 15:15:36 -07:00
Baligh Uddin
3fa1658e7f Merge "Import translations. DO NOT MERGE" 2013-07-19 22:14:26 +00:00
Baligh Uddin
8180a3a86a Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-07-19 22:14:12 +00:00
The Android Open Source Project
58311f9083 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I54f669254cc0552c2f0492d799f977854eed409b
2013-07-19 14:21:02 -07:00
Robert Greenwalt
ea6b5d63d9 am 275c1dff: am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '275c1dff7dbec58588b0c696fc5ff4dc80ca6942':
  Use ConnectivityManager for mobile provision url
2013-07-19 13:43:04 -07:00
Robert Greenwalt
275c1dff7d am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '3c087a68f6e627f48eb0cea2dfbf21b47d3ab24a':
  Use ConnectivityManager for mobile provision url
2013-07-19 13:33:33 -07:00
Amith Yamasani
a28787a1cb Remove spurious import
Change-Id: I91172626f4ec64c0fc7497f9f7d11244ca49a341
2013-07-19 13:21:35 -07:00
Amith Yamasani
0ee32a1254 Merge "Apply restrictions right away instead of on exit" 2013-07-19 19:49:16 +00:00
Amith Yamasani
9247265466 Permission to manage device admins
Change-Id: I4c3c86cc6c0dba16c51dc45f62e1213ad5be5df0
2013-07-19 12:37:42 -07:00
Robert Greenwalt
638bfd9e87 am ba32c249: resolved conflicts for merge of 4d9f670b to stage-aosp-master
* commit 'ba32c249addded770c288771748aa25d554352a0':
  Fix issue 52986: Wifi settings abnormal when screen rotation
2013-07-18 21:16:01 -07:00
Robert Greenwalt
ba32c249ad resolved conflicts for merge of 4d9f670b to stage-aosp-master
Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
2013-07-18 20:52:47 -07:00
Alan Viverette
341ff66e03 Move accessibility settings to their own package
Change-Id: I5822bf4a81f5ade4ee0649ed30c2daa40d7e8fe2
2013-07-18 17:49:33 -07:00
Robert Greenwalt
4d9f670bdb Merge "Fix issue 52986: Wifi settings abnormal when screen rotation" 2013-07-19 00:17:42 +00:00
Baligh Uddin
ae38a85d46 Import translations. DO NOT MERGE
Change-Id: I36ca8a984f864c080cda8f14bab6fa63b3781e68
Auto-generated-cl: translation import
2013-07-18 14:35:25 -07:00
Baligh Uddin
aafe0b9134 Import translations. DO NOT MERGE
Change-Id: Ife5526347f8eab9b8b385b5b6f265c1678b8e94a
Auto-generated-cl: translation import
2013-07-18 14:31:45 -07:00
Baligh Uddin
68b8750554 Import translations. DO NOT MERGE
Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
2013-07-18 14:30:01 -07:00
Amith Yamasani
7eedcf4a50 Apply restrictions right away instead of on exit
Use usermanager to clear restrictions, as it needs to do a bunch of
book keeping.

Apply PIN restriction to master clear button.

Changing existing PIN now includes verifying the PIN, so it doesn't
need to be cleared here in Settings.

Removed automatic persisting of restrictions on receiving them unless
it is a restricted profile.

Make apps that are signed with platform certs immutable and ON.

Change-Id: Iffd1bf2eb0d18202fb66ddcf80668baa8e6b84ed
2013-07-18 11:37:32 -07:00
Robert Greenwalt
cc0c5851a2 Use ConnectivityManager for mobile provision url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-18 11:25:01 -07:00
Robert Greenwalt
3c087a68f6 Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev 2013-07-17 23:47:01 +00:00
Robert Greenwalt
4929e912c0 Use ConnectivityManager for mobile provision url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-16 14:39:50 -07:00
Baligh Uddin
8e3405d85a am f6d197a7: (-s ours) am 613cab12: am f9d69170: Import translations. DO NOT MERGE
* commit 'f6d197a75930cfba096c4983c4f27a10158536fa':
  Import translations. DO NOT MERGE
2013-07-15 19:46:48 -07:00
Baligh Uddin
f6d197a759 am 613cab12: am f9d69170: Import translations. DO NOT MERGE
* commit '613cab12188b59b907834d6e8e473219ba6306a8':
  Import translations. DO NOT MERGE
2013-07-15 19:44:11 -07:00
Baligh Uddin
508165e3aa am 48fa42b5: (-s ours) am 3f573fae: Import translations. DO NOT MERGE
* commit '48fa42b58bd46c9f424b249827ae68beeb54c49b':
  Import translations. DO NOT MERGE
2013-07-15 19:42:24 -07:00
Baligh Uddin
613cab1218 am f9d69170: Import translations. DO NOT MERGE
* commit 'f9d691707c2acfa5808d3f7b14ec520e24c9e8c6':
  Import translations. DO NOT MERGE
2013-07-15 19:40:53 -07:00
Baligh Uddin
48fa42b58b am 3f573fae: Import translations. DO NOT MERGE
* commit '3f573faef91c31198f95730614fad751b7cdc8f1':
  Import translations. DO NOT MERGE
2013-07-15 19:40:53 -07:00
Baligh Uddin
f462cd6d8e Merge "Import translations. DO NOT MERGE" 2013-07-16 02:39:06 +00:00
Amith Yamasani
12d2d812a3 Merge "Potential fix for Settings instability on x-large." 2013-07-15 22:36:49 +00:00
Amith Yamasani
6cb5630c17 Potential fix for Settings instability on x-large.
Bug: 9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
2013-07-15 15:35:29 -07:00
Baligh Uddin
3ac8cb4916 Import translations. DO NOT MERGE
Change-Id: Iea816bd3e1110127bc01ea2beacc0071ed42ed24
Auto-generated-cl: translation import
2013-07-15 11:41:29 -07:00
Baligh Uddin
3f573faef9 Import translations. DO NOT MERGE
Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
2013-07-15 11:38:16 -07:00
Baligh Uddin
f9d691707c Import translations. DO NOT MERGE
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
2013-07-15 11:36:58 -07:00
The Android Open Source Project
09fb2a55d9 am f2d9e68c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'f2d9e68c238d754d00fa846b4d4c6737a24595fc':
2013-07-15 09:37:51 -07:00
The Android Open Source Project
f2d9e68c23 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe
2013-07-15 09:33:36 -07:00
The Android Automerger
d9575910e7 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:20 -07:00
Wink Saville
5c2075037d am eeb90735: am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit 'eeb90735dd7accfa34d77bcc8023412dab84bf9d':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:14:02 -07:00
Wink Saville
eeb90735dd am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:54 -07:00
Wink Saville
95c2a4a430 am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '80bfbd53151eccb8888aafc81d3dccea87cdca29':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:01:43 -07:00
Wink Saville
80bfbd5315 Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:58:56 +00:00
Baligh Uddin
a1d0ba00cd am 9d41a551: (-s ours) am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '9d41a551e5ceb23afb21db818626a5b377f410a9':
  Import translations. DO NOT MERGE
2013-07-11 14:55:01 -07:00