OSDN Git Service
Baligh Uddin [Tue, 11 Dec 2012 05:14:49 +0000 (21:14 -0800)]
am
e17335e9: (-s ours) am
3b10f0ba: Import translations. DO NOT MERGE
* commit '
e17335e98267b856822499315b9a66aacf1c2f69':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:12:02 +0000 (21:12 -0800)]
am
3b10f0ba: Import translations. DO NOT MERGE
* commit '
3b10f0ba055fce7b8893897e88405bff0fb66fca':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Dec 2012 05:10:31 +0000 (21:10 -0800)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Mon, 10 Dec 2012 23:23:15 +0000 (15:23 -0800)]
am
c9b5f99c: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
c9b5f99c1d1404b02b123771357be32430363ba2':
The Android Open Source Project [Mon, 10 Dec 2012 23:19:47 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9438d179ff8a407f87b5b501d4ea1d006f2fb77c
Baligh Uddin [Mon, 10 Dec 2012 18:59:51 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7a79e2be8d71ac1a06ec243207fa473ad960d2cb
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 18:55:55 +0000 (10:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1f403d01d8d3d7336d869555e69af22b460f7a37
Auto-generated-cl: translation import
Elliott Hughes [Sat, 8 Dec 2012 18:59:12 +0000 (10:59 -0800)]
am
68066a78: am
e2d893e2: Merge "Makes the add button for new APNs appear in the action bar."
* commit '
68066a78352ea6b147767e84a5481764f0054f2b':
Makes the add button for new APNs appear in the action bar.
Elliott Hughes [Sat, 8 Dec 2012 18:57:51 +0000 (10:57 -0800)]
am
e2d893e2: Merge "Makes the add button for new APNs appear in the action bar."
* commit '
e2d893e2af36e4ede8d1ec074912563ae6ecf7ef':
Makes the add button for new APNs appear in the action bar.
Elliott Hughes [Sat, 8 Dec 2012 17:55:08 +0000 (09:55 -0800)]
Merge "Makes the add button for new APNs appear in the action bar."
Amith Yamasani [Fri, 7 Dec 2012 22:20:16 +0000 (14:20 -0800)]
Merge "Don't do the developer options countdown for secondary users."
Amith Yamasani [Fri, 7 Dec 2012 22:18:28 +0000 (14:18 -0800)]
Don't do the developer options countdown for secondary users.
Bug:
7469031
Change-Id: I794cb8b67a9221cc4fcd2dd6208777648c818fe0
The Android Automerger [Fri, 7 Dec 2012 21:26:24 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Wink Saville [Fri, 7 Dec 2012 20:21:45 +0000 (12:21 -0800)]
am
4e0391a7: am
49c4de7f: Merge "Format change at "Mobile network type" value"
* commit '
4e0391a733a3c5ba0c23c00c165aeb580426cee1':
Format change at "Mobile network type" value
Wink Saville [Fri, 7 Dec 2012 20:18:53 +0000 (12:18 -0800)]
am
49c4de7f: Merge "Format change at "Mobile network type" value"
* commit '
49c4de7f139a1a3a60dc8f7e72acae710dba506f':
Format change at "Mobile network type" value
Baligh Uddin [Fri, 7 Dec 2012 19:48:10 +0000 (11:48 -0800)]
am
f1eb2f44: (-s ours) am
957f7fc9: am
3674d869: Import translations. DO NOT MERGE
* commit '
f1eb2f4498ce6e10c3b72c3a3cb47a80eba1959e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:47:42 +0000 (11:47 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 7 Dec 2012 19:46:45 +0000 (11:46 -0800)]
am
4377b807: (-s ours) am
29ce5561: Import translations. DO NOT MERGE
* commit '
4377b80732d89ba10211ceff206517cf3c9ca875':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:45:54 +0000 (11:45 -0800)]
am
957f7fc9: am
3674d869: Import translations. DO NOT MERGE
* commit '
957f7fc94eaab5d57d82c76a3a06acd0ab2dc018':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:44:30 +0000 (11:44 -0800)]
am
29ce5561: Import translations. DO NOT MERGE
* commit '
29ce5561d85c121c293acc13b60a291365679a46':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:44:18 +0000 (11:44 -0800)]
am
3674d869: Import translations. DO NOT MERGE
* commit '
3674d8695166be6c0b7cc225f227f9e1604056e8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Dec 2012 19:38:03 +0000 (11:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7b1104d9f823970bc78cbd8681c67b300057f61b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Dec 2012 19:35:18 +0000 (11:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Dec 2012 19:34:10 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic8bff7a52926a927353fa5933a68dfc17921e6d1
Auto-generated-cl: translation import
Amith Yamasani [Fri, 7 Dec 2012 18:47:45 +0000 (10:47 -0800)]
am
b722b80d: am
b7d94e74: am
aeb57eda: Pass the locale code in the help url for help pages.
* commit '
b722b80da8481a1570dbe4be89b8ed70daec6b41':
Pass the locale code in the help url for help pages.
Amith Yamasani [Fri, 7 Dec 2012 18:45:30 +0000 (10:45 -0800)]
am
b7d94e74: am
aeb57eda: Pass the locale code in the help url for help pages.
* commit '
b7d94e74e1342c5583883e596fd268745a5a25b6':
Pass the locale code in the help url for help pages.
Amith Yamasani [Fri, 7 Dec 2012 18:43:37 +0000 (10:43 -0800)]
am
aeb57eda: Pass the locale code in the help url for help pages.
* commit '
aeb57edaef1abdcdcd21eb443047386940ffb755':
Pass the locale code in the help url for help pages.
Amith Yamasani [Thu, 6 Dec 2012 22:40:51 +0000 (14:40 -0800)]
Pass the locale code in the help url for help pages.
Otherwise the help will always be shown in English.
Bug:
7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
Wink Saville [Thu, 6 Dec 2012 16:51:22 +0000 (08:51 -0800)]
Merge "Format change at "Mobile network type" value"
Akira Oshimi [Thu, 18 Oct 2012 09:14:00 +0000 (18:14 +0900)]
Format change at "Mobile network type" value
Remove "network type Number" from "mobile network type" value
at "About Phone > Status".
For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)
The number ":0" did not add much value to the user.
Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
The Android Open Source Project [Wed, 5 Dec 2012 21:01:02 +0000 (13:01 -0800)]
am
1aa371fc: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6':
Jake Hamby [Wed, 5 Dec 2012 20:29:03 +0000 (12:29 -0800)]
am
ac9bb0bd: am
b39ab37a: am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
ac9bb0bdc0c2ef42d259e555187061a0ea95c8f2':
Add latest area info broadcast to Settings status screen.
Baligh Uddin [Wed, 5 Dec 2012 20:23:11 +0000 (12:23 -0800)]
am
e912b763: (-s ours) am
e30adf2f: am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
e912b763ee9e631129512162c3e934aaf4bc1e91':
Import translations. DO NOT MERGE
The Android Open Source Project [Wed, 5 Dec 2012 19:10:16 +0000 (11:10 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I2333de9f3a171fef3c806003d0e662570d01af1e
The Android Automerger [Wed, 5 Dec 2012 18:27:58 +0000 (10:27 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Wed, 5 Dec 2012 16:25:27 +0000 (08:25 -0800)]
am
482dd21c: (-s ours) am
9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
482dd21ca2ccd350957dba3cf7d207a8533a9bdf':
Import translations. DO NOT MERGE
Jake Hamby [Wed, 5 Dec 2012 04:09:34 +0000 (20:09 -0800)]
am
b39ab37a: am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
b39ab37aa0e8be02a61c4245c181e523419ba703':
Add latest area info broadcast to Settings status screen.
Jake Hamby [Wed, 5 Dec 2012 04:08:21 +0000 (20:08 -0800)]
am
bc5d9271: Add latest area info broadcast to Settings status screen.
* commit '
bc5d9271a9d36ecf07ac35e1635f36679074de6f':
Add latest area info broadcast to Settings status screen.
The Android Automerger [Wed, 5 Dec 2012 03:59:27 +0000 (19:59 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jake Hamby [Tue, 4 Dec 2012 01:24:30 +0000 (17:24 -0800)]
Add latest area info broadcast to Settings status screen.
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.
Bug:
7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
Baligh Uddin [Wed, 5 Dec 2012 00:34:48 +0000 (16:34 -0800)]
am
e30adf2f: am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
e30adf2f65241b6337dc4090631673a2fec904e1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Dec 2012 00:31:30 +0000 (16:31 -0800)]
am
d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
d2bd59f5e8e2359e6697dd8975ccfd1aa36b4103':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 21:49:33 +0000 (13:49 -0800)]
am
9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
9a2cee1d1e391147b3e21d10549b190ba79c4199':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 21:47:16 +0000 (13:47 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 4 Dec 2012 21:46:55 +0000 (13:46 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 19:16:12 +0000 (11:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925
Auto-generated-cl: translation import
Baligh Uddin [Tue, 4 Dec 2012 19:14:54 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I950a025ffdb3ac8cb21a9e80175eef115ddac9d4
Auto-generated-cl: translation import
Daniel Sandler [Tue, 4 Dec 2012 19:06:53 +0000 (11:06 -0800)]
am
1c7c8242: am
5428ce65: am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
1c7c8242ae946c102aca7737cd85ab743aabcb74':
Revised language for notification ringtone picker.
Daniel Sandler [Tue, 4 Dec 2012 19:04:57 +0000 (11:04 -0800)]
am
5428ce65: am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
5428ce650b161f5a4dfdccb2b4a54f18544e4068':
Revised language for notification ringtone picker.
Daniel Sandler [Tue, 4 Dec 2012 19:02:18 +0000 (11:02 -0800)]
am
300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
* commit '
300f8299a6085e295e288d535ad3b8fd0ccbb1cf':
Revised language for notification ringtone picker.
Daniel Sandler [Tue, 4 Dec 2012 19:00:59 +0000 (11:00 -0800)]
Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 16:21:43 +0000 (08:21 -0800)]
am
1e9dea67: (-s ours) am
613b168d: am
d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
1e9dea67c93b8791a60e201ecdb5b7372c82cec6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 16:20:17 +0000 (08:20 -0800)]
am
1991ec83: (-s ours) am
a62ac990: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
1991ec8386b7c85d20db290d9e414f1787198737':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 16:19:09 +0000 (08:19 -0800)]
am
613b168d: am
d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
613b168df1eb569db9ed9d1345847fea1674b9b0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 16:17:44 +0000 (08:17 -0800)]
am
a62ac990: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
a62ac990a13fdb3f8e8e35dae30c2453cbe51cbc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 16:16:59 +0000 (08:16 -0800)]
am
d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
d2380b8e2f783c96fcf55b69a9bb5e90a91b0af8':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Dec 2012 16:15:36 +0000 (08:15 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 4 Dec 2012 16:15:04 +0000 (08:15 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Tue, 4 Dec 2012 16:14:31 +0000 (08:14 -0800)]
Merge "Import translations. DO NOT MERGE"
Danielle Millett [Tue, 4 Dec 2012 16:11:16 +0000 (08:11 -0800)]
am
949318a6: am
ce50c681: am
aeb199ab: Better layouts for security screen setups as part of b/
7459863
* commit '
949318a6f46225b367e04e5a7acd55011ebe8ad6':
Better layouts for security screen setups as part of b/
7459863
Danielle Millett [Tue, 4 Dec 2012 16:09:49 +0000 (08:09 -0800)]
am
ce50c681: am
aeb199ab: Better layouts for security screen setups as part of b/
7459863
* commit '
ce50c6816a205ba2e9a6867f65f6a6ee799fef56':
Better layouts for security screen setups as part of b/
7459863
Danielle Millett [Tue, 4 Dec 2012 16:08:01 +0000 (08:08 -0800)]
am
aeb199ab: Better layouts for security screen setups as part of b/
7459863
* commit '
aeb199ab00cb8f470a14f02fe2e67527ca72e737':
Better layouts for security screen setups as part of b/
7459863
Daniel Sandler [Tue, 4 Dec 2012 14:05:10 +0000 (09:05 -0500)]
Revised language for notification ringtone picker.
Bug:
7659273
Change-Id: Id2702881d3789447ee18530749897448306d4148
Baligh Uddin [Mon, 3 Dec 2012 20:09:04 +0000 (12:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4b949a7ab1b917a27773fe707c2dd0830116d361
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Dec 2012 20:06:15 +0000 (12:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id0c38bd59bc3019d70d4c8320019ce0cb0a697ef
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Dec 2012 20:04:55 +0000 (12:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibfe45f546221f193711cfeb4bf25ccd05c04be50
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 3 Dec 2012 19:36:45 +0000 (11:36 -0800)]
am
bc9e8c4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
bc9e8c4a63e91305fe182de414cca8220e0023c4':
The Android Open Source Project [Mon, 3 Dec 2012 19:34:37 +0000 (11:34 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I889bdeceda8d6b158a8b70596450156f5a68910f
The Android Automerger [Mon, 3 Dec 2012 14:07:14 +0000 (06:07 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Danielle Millett [Sat, 1 Dec 2012 03:10:32 +0000 (19:10 -0800)]
am
783d0e7d: am
a5ca5158: am
49562681: Merge "Removing tutorial for choosing a pattern as part of b/
7459863" into jb-mr1.1-dev
* commit '
783d0e7d9d2dcc05a45b2c5ec7117f61f460642d':
Removing tutorial for choosing a pattern as part of b/
7459863
Danielle Millett [Wed, 21 Nov 2012 16:20:10 +0000 (11:20 -0500)]
Better layouts for security screen setups as part of b/
7459863
The major change is that choose pattern and confirm pattern layouts
no longer uses a split screen layout on tablets. The new layout
closely mimics the layout for portrait.
Other minor changes include:
-Made the header font size for confirm pattern and choose pattern
medium (this matches with face unlock changes).
-Made the buttons on choose pattern for landscape phone side-by-side
rather than above each other (to be consistent with face unlock).
-Removed the black background from phone landscape confirm pattern
since it's inconsistent with all the other layouts.
Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87
Jeff Sharkey [Sat, 1 Dec 2012 02:47:13 +0000 (18:47 -0800)]
am
f41b7643: am
3f5c8ede: am
5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
* commit '
f41b76430d584733dcfa9a2386bf0c379d04b0ed':
Push scrollbars to screen edges.
Jeff Sharkey [Sat, 1 Dec 2012 02:47:12 +0000 (18:47 -0800)]
am
90b39714: am
3024299c: am
c3f76cf1: Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev
* commit '
90b39714e9a9ec1064382be64e2dd46e85a3e2b6':
Fix text alignment and simplify layouts.
Jeff Sharkey [Sat, 1 Dec 2012 02:47:11 +0000 (18:47 -0800)]
am
1ed3d1c8: am
1d3dbecd: am
b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
* commit '
1ed3d1c820886732f293f0909a4dbfcb651deae4':
Fix incorrectly inverted text color.
Danielle Millett [Sat, 1 Dec 2012 02:31:26 +0000 (18:31 -0800)]
am
a5ca5158: am
49562681: Merge "Removing tutorial for choosing a pattern as part of b/
7459863" into jb-mr1.1-dev
* commit '
a5ca51587d2fe3872f9e8610b5bd6e3e29bdefb1':
Removing tutorial for choosing a pattern as part of b/
7459863
Danielle Millett [Sat, 1 Dec 2012 02:29:14 +0000 (18:29 -0800)]
am
49562681: Merge "Removing tutorial for choosing a pattern as part of b/
7459863" into jb-mr1.1-dev
* commit '
495626818d5fcba9c7e15c23788a55e456116260':
Removing tutorial for choosing a pattern as part of b/
7459863
Danielle Millett [Sat, 1 Dec 2012 02:26:58 +0000 (18:26 -0800)]
Merge "Removing tutorial for choosing a pattern as part of b/
7459863" into jb-mr1.1-dev
Jeff Sharkey [Sat, 1 Dec 2012 01:48:46 +0000 (17:48 -0800)]
am
3f5c8ede: am
5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
* commit '
3f5c8ede376ecd0ea5610414a2f99191931ae77b':
Push scrollbars to screen edges.
Jeff Sharkey [Sat, 1 Dec 2012 01:46:47 +0000 (17:46 -0800)]
am
5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
* commit '
5e337eda4ff40673e1498603134b6731b8e50da1':
Push scrollbars to screen edges.
Jeff Sharkey [Sat, 1 Dec 2012 01:46:18 +0000 (17:46 -0800)]
am
3024299c: am
c3f76cf1: Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev
* commit '
3024299c6f046a0bb856c6e23d10ac851842d293':
Fix text alignment and simplify layouts.
Jeff Sharkey [Sat, 1 Dec 2012 01:46:17 +0000 (17:46 -0800)]
am
1d3dbecd: am
b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
* commit '
1d3dbecd9c76e0475f77d5bb443cd06018513944':
Fix incorrectly inverted text color.
Jeff Sharkey [Sat, 1 Dec 2012 01:45:22 +0000 (17:45 -0800)]
am
c3f76cf1: Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev
* commit '
c3f76cf130a93fff5fefd7ccaa8de947bee99665':
Fix text alignment and simplify layouts.
Jeff Sharkey [Sat, 1 Dec 2012 01:45:20 +0000 (17:45 -0800)]
am
b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
* commit '
b0f3f8dbea32c8566ae29af4b9e2fcb904588c4f':
Fix incorrectly inverted text color.
Jeff Sharkey [Sat, 1 Dec 2012 01:44:52 +0000 (17:44 -0800)]
Merge "Push scrollbars to screen edges." into jb-mr1.1-dev
Jeff Sharkey [Sat, 1 Dec 2012 01:44:48 +0000 (17:44 -0800)]
Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev
Jeff Sharkey [Sat, 1 Dec 2012 01:44:23 +0000 (17:44 -0800)]
Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev
Amith Yamasani [Sat, 1 Dec 2012 00:48:20 +0000 (16:48 -0800)]
am
5ddbefbe: am
64e327e1: am
1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
* commit '
5ddbefbe7b176be6c822d368d782cdc6d010b97c':
Disable USB debugging checkbox and backup password for secondary users
Amith Yamasani [Sat, 1 Dec 2012 00:46:06 +0000 (16:46 -0800)]
am
64e327e1: am
1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
* commit '
64e327e1ef441491e700270e24299912aea8d6fe':
Disable USB debugging checkbox and backup password for secondary users
Amith Yamasani [Sat, 1 Dec 2012 00:44:27 +0000 (16:44 -0800)]
am
1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
* commit '
1cadd481bc34b466809b944a0f8490767cf92787':
Disable USB debugging checkbox and backup password for secondary users
Amith Yamasani [Sat, 1 Dec 2012 00:42:05 +0000 (16:42 -0800)]
Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev
Jeff Sharkey [Fri, 30 Nov 2012 20:36:53 +0000 (12:36 -0800)]
Push scrollbars to screen edges.
Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.
Bug:
7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
Jeff Sharkey [Fri, 30 Nov 2012 20:38:55 +0000 (12:38 -0800)]
Fix text alignment and simplify layouts.
Fix Apps items to correctly base align text, and to align correctly
in RTL mode. Use GridLayout to reduce layout complexity.
Bug:
7633350,
7132595
Change-Id: Ic3563cfe408ebcdaef1ed693cc6b01b886d700ea
Amith Yamasani [Fri, 30 Nov 2012 22:20:04 +0000 (14:20 -0800)]
Disable USB debugging checkbox and backup password for secondary users
This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.
Bug:
7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
Jeff Sharkey [Fri, 30 Nov 2012 20:32:58 +0000 (12:32 -0800)]
Fix incorrectly inverted text color.
Bug:
7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
Daniel Sandler [Fri, 30 Nov 2012 19:04:29 +0000 (11:04 -0800)]
am
8a8a265b: am
aea3fbde: am
77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
* commit '
8a8a265b88bda03f0ccc221522e2f038aed9f1ff':
Add android.settings.DREAM_SETTINGS for Daydream settings.
Daniel Sandler [Fri, 30 Nov 2012 19:02:23 +0000 (11:02 -0800)]
am
aea3fbde: am
77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
* commit '
aea3fbde280107738281f568cb1f4d860f50abfc':
Add android.settings.DREAM_SETTINGS for Daydream settings.
Daniel Sandler [Fri, 30 Nov 2012 19:00:17 +0000 (11:00 -0800)]
am
77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
* commit '
77ec6de156c52edbda95894a609cc43dcd29e454':
Add android.settings.DREAM_SETTINGS for Daydream settings.
Daniel Sandler [Fri, 30 Nov 2012 18:58:03 +0000 (10:58 -0800)]
Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev
Evan Charlton [Fri, 30 Nov 2012 18:23:02 +0000 (10:23 -0800)]
am
a835f66e: am
b71b78a4: am
6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
* commit '
a835f66ec736b7c2cdf4ca433f70161ef2290359':
Use plurals for the developer steps countdown
Evan Charlton [Fri, 30 Nov 2012 18:20:38 +0000 (10:20 -0800)]
am
b71b78a4: am
6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
* commit '
b71b78a4d4e8c4b7a7514abd692c72898cd665ce':
Use plurals for the developer steps countdown
OSDN Git Service
