Commit Graph

7561 Commits

Author SHA1 Message Date
Baligh Uddin
d6cdaebe69 am dd7857e2: (-s ours) am 70372dcf: Import translations. DO NOT MERGE
* commit 'dd7857e28f7f066d7e92e42ab607db612b5fc123':
  Import translations. DO NOT MERGE
2012-08-13 15:49:23 -07:00
Baligh Uddin
dd7857e28f am 70372dcf: Import translations. DO NOT MERGE
* commit '70372dcfc382c78c41013fa4d9e4a8bdcc7838ae':
  Import translations. DO NOT MERGE
2012-08-13 15:46:48 -07:00
Baligh Uddin
e5bdab3775 Import translations. DO NOT MERGE
Change-Id: I57cc82b205973c1de47c4d488742d799606dad02
Auto-generated-cl: translation import
2012-08-13 13:30:49 -07:00
Baligh Uddin
70372dcfc3 Import translations. DO NOT MERGE
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
2012-08-13 13:27:25 -07:00
Amith Yamasani
bdc19f33cb am 032aa5a5: am 32630395: Use UserManager instead of PackageManager for user management
* commit '032aa5a5ba22a5c46adc0fda210689c25e0e2bb5':
  Use UserManager instead of PackageManager for user management
2012-08-11 21:59:11 -07:00
Amith Yamasani
032aa5a5ba am 32630395: Use UserManager instead of PackageManager for user management
* commit '32630395eb7dd8401f344599640c8bcf1e289bb0':
  Use UserManager instead of PackageManager for user management
2012-08-11 21:57:51 -07:00
Amith Yamasani
32630395eb Use UserManager instead of PackageManager for user management
Show Accounts in secondary settings
Move Users & restrictions to Device section

Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
2012-08-10 19:53:29 -07:00
Baligh Uddin
45f7d1523b am 424111dd: (-s ours) am 5ef3293e: Import translations. DO NOT MERGE
* commit '424111dd2a01337605b65c5ae7c67f19d18bc5e7':
  Import translations. DO NOT MERGE
2012-08-10 15:38:44 -07:00
Baligh Uddin
424111dd2a am 5ef3293e: Import translations. DO NOT MERGE
* commit '5ef3293ed2bfd43e6a179121e6b562e56ced3feb':
  Import translations. DO NOT MERGE
2012-08-10 15:36:48 -07:00
Baligh Uddin
81ae2a0d90 Merge "Import translations. DO NOT MERGE" 2012-08-10 15:34:31 -07:00
Baligh Uddin
2dfd140920 Import translations. DO NOT MERGE
Change-Id: I1bbf91bf64b56688b5772ae6d86d6aa0168f4d51
Auto-generated-cl: translation import
2012-08-10 11:24:00 -07:00
Baligh Uddin
5ef3293ed2 Import translations. DO NOT MERGE
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
2012-08-10 11:21:05 -07:00
The Android Open Source Project
6f80a77adb am 9698d362: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '9698d3624c5e66cbff3c89e56a1388b6b2be9c1d':
2012-08-10 08:55:54 -07:00
The Android Open Source Project
9698d3624c Reconcile with jb-mr1-release - do not merge
Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66
2012-08-10 08:53:55 -07:00
Przemyslaw Szczepaniak
7edae431ee am 06649d02: am 923187a1: Keep speech rate dialog after rotate
* commit '06649d02b2d6e3f147a1082c7538682f97e64a0b':
  Keep speech rate dialog after rotate
2012-08-10 07:18:23 -07:00
Przemyslaw Szczepaniak
06649d02b2 am 923187a1: Keep speech rate dialog after rotate
* commit '923187a159cb0c192a2f978a6bf1dd51275ea916':
  Keep speech rate dialog after rotate
2012-08-10 07:17:36 -07:00
Przemyslaw Szczepaniak
923187a159 Keep speech rate dialog after rotate
It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
2012-08-10 07:13:52 -07:00
Baligh Uddin
b1e833987b am 2dc3d551: (-s ours) am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '2dc3d551963426df9411fbc48db9f4112014d21b':
  Import translations. DO NOT MERGE
2012-08-09 19:53:46 -07:00
Baligh Uddin
2dc3d55196 am 658f909d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '658f909d711b1598ec6f49447679569f0bc19c15':
  Import translations. DO NOT MERGE
2012-08-09 19:52:40 -07:00
Baligh Uddin
658f909d71 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-09 19:50:14 -07:00
Baligh Uddin
35293e5500 Merge "Import translations. DO NOT MERGE" 2012-08-09 19:49:10 -07:00
Irfan Sheriff
79a0554444 am 6a88ef4b: am aae0659e: Setting to turn off power optimizations
* commit '6a88ef4bd233591cfdd3cfa5cee9af61483242eb':
  Setting to turn off power optimizations
2012-08-09 16:06:33 -07:00
Irfan Sheriff
6a88ef4bd2 am aae0659e: Setting to turn off power optimizations
* commit 'aae0659e18e013401b83717a83ec25393d4ba626':
  Setting to turn off power optimizations
2012-08-09 15:58:13 -07:00
Irfan Sheriff
aae0659e18 Setting to turn off power optimizations
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
2012-08-09 15:16:07 -07:00
Baligh Uddin
f2ccce3633 Import translations. DO NOT MERGE
Change-Id: I5e16b50a8efca5da984acc9ad76d3bed76ee8d83
Auto-generated-cl: translation import
2012-08-09 12:42:04 -07:00
Baligh Uddin
0ad6982813 Import translations. DO NOT MERGE
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
2012-08-09 12:39:18 -07:00
The Android Automerger
9daa72c4e8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-09 09:29:59 -07:00
John Spurlock
fc470e4db7 am aeb7b571: am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
* commit 'aeb7b5710593b982d2306eb2006b6ae153655141':
  Fix NPE in Dreams settings.
2012-08-09 06:22:56 -07:00
John Spurlock
aeb7b57105 am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
* commit 'eaffad37c19ac5859539c232a7dc8d2f47159f61':
  Fix NPE in Dreams settings.
2012-08-09 06:20:50 -07:00
John Spurlock
eaffad37c1 Merge "Fix NPE in Dreams settings." into jb-mr1-dev 2012-08-09 06:18:45 -07:00
John Spurlock
7a99b21a4b Fix NPE in Dreams settings.
Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9
2012-08-09 09:03:48 -04:00
Baligh Uddin
1178969da3 am 8aa63452: (-s ours) am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8aa634529cfeda5d375a2a541038b8b7976f8a85':
  Import translations. DO NOT MERGE
2012-08-08 20:05:51 -07:00
Baligh Uddin
8aa634529c am 702cdf4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '702cdf4c9a84fd9bcb258cdb26c57fd8d50961d6':
  Import translations. DO NOT MERGE
2012-08-08 20:04:24 -07:00
Baligh Uddin
702cdf4c9a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:02:24 -07:00
Baligh Uddin
d2983fd132 Merge "Import translations. DO NOT MERGE" 2012-08-08 20:01:24 -07:00
Jean-Baptiste Queru
9b46e9a231 am 17d915b7: am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '17d915b7fdc4527710022ed3dd6c48bc03b8157b':
  Add support for SE Android to the Settings app.
2012-08-08 15:11:26 -07:00
Jean-Baptiste Queru
17d915b7fd am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '66321184570da9e93c089b2a1065fc3d4c7230a3':
  Add support for SE Android to the Settings app.
2012-08-08 14:09:11 -07:00
Jean-Baptiste Queru
6632118457 am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '7526636406087666d005d389ddc0cdacd79499fd':
  Add support for SE Android to the Settings app.
2012-08-08 14:06:31 -07:00
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
2012-08-08 14:04:11 -07:00
Baligh Uddin
b20162733a Import translations. DO NOT MERGE
Change-Id: I036bc0a27767d78ad6cb86b255db7af28e9040d6
Auto-generated-cl: translation import
2012-08-08 13:44:29 -07:00
Baligh Uddin
24fb893381 Import translations. DO NOT MERGE
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
2012-08-08 13:40:29 -07:00
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
The Android Open Source Project
77ea82f697 am a01ab9e5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'a01ab9e5763b16e89239f40a56edfee5f0c8fa75':
2012-08-08 08:21:52 -07:00
The Android Open Source Project
a01ab9e576 Reconcile with jb-mr1-release - do not merge
Change-Id: I6809fcad464f90b62407ba5e19da9a226ca3be83
2012-08-08 08:18:04 -07:00
The Android Automerger
3f793b5654 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:47:58 -07:00
Matthew Xie
4b6c57c74b am 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
* commit '83457dd79bb481afe9a1ad16259802b0a09fe68a':
  Remove Profile Auto connection specific logic
2012-08-08 00:37:48 -07:00
Matthew Xie
83457dd79b am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
* commit 'a1f463cb1930e806420844d4915def2dcfe7ae72':
  Remove Profile Auto connection specific logic
2012-08-08 00:35:29 -07:00
Matthew Xie
a1f463cb19 Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 2012-08-08 00:33:38 -07:00
Baligh Uddin
e7522c808f Merge "Import translations. DO NOT MERGE" 2012-08-07 16:12:21 -07:00
The Android Open Source Project
227a1f66e7 am 422446e1: (-s ours) am 4325cf22: am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '422446e1ef8d42501a72800f81037ff142119f62':
2012-08-07 15:22:53 -07:00