OSDN Git Service
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
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.
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
Evan Charlton [Fri, 30 Nov 2012 18:18:27 +0000 (10:18 -0800)]
am
6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
* commit '
6c269982f3b188b5d7f70fcb670ab191b39b2689':
Use plurals for the developer steps countdown
Evan Charlton [Fri, 30 Nov 2012 18:15:24 +0000 (10:15 -0800)]
Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
Przemyslaw Szczepaniak [Wed, 28 Nov 2012 16:18:22 +0000 (16:18 +0000)]
Fix radio buttons when user cancel TTS engine change
When user decides to change tts engine, and if it's not system one,
then he sees dialog warning about possibility of sending all kinds of
data to the engine.
If user chooses to not changes engine, radio button still sticks to the
new position.
This change delays all operations regarding changing current engine
after user closes dialog. It also unsets the radio button if user chooses
to cancel it.
Bug:
7628362
Change-Id: I977abe71b3547f2545a971fc0d69179be6fafb44
Baligh Uddin [Fri, 30 Nov 2012 05:29:10 +0000 (21:29 -0800)]
am
df0c7e76: (-s ours) am
918c847d: am
43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
df0c7e76014c0765e764da6dbfc2a08309ac6018':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:27:45 +0000 (21:27 -0800)]
am
e5187da9: (-s ours) am
4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
e5187da9cc678c42fe6cc7eb644d1042be0c7eb4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:27:44 +0000 (21:27 -0800)]
am
918c847d: am
43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
918c847dacbc52af3c1f438318bc1bb3ce9ceed8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:25:46 +0000 (21:25 -0800)]
am
43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
* commit '
436350817f550819a3bf514c9ea74e12a1fbb2e8':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:25:14 +0000 (21:25 -0800)]
am
4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
4d9ba0114a4c5e3b54be65bee667ce3c3f06415e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Nov 2012 05:24:09 +0000 (21:24 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 30 Nov 2012 05:23:45 +0000 (21:23 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Baligh Uddin [Fri, 30 Nov 2012 05:23:28 +0000 (21:23 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Jeff Sharkey [Fri, 30 Nov 2012 02:04:53 +0000 (18:04 -0800)]
am
12960527: (-s ours) am
90dbd693: am
39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
* commit '
129605270a81e51e730394682cc035b78b4e86a5':
Use uniform font size for APNs and timezones. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:04:52 +0000 (18:04 -0800)]
am
2f12147e: (-s ours) am
a04497d7: am
5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
* commit '
2f12147e91ecdf3d8d36e1f0d82be85f69d735db':
Avoid split action bar when it only has one item. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:02:09 +0000 (18:02 -0800)]
am
90dbd693: am
39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
* commit '
90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6':
Use uniform font size for APNs and timezones. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:02:08 +0000 (18:02 -0800)]
am
a04497d7: am
5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
* commit '
a04497d70cc4f422cfa36c5be2f35a6170d5725a':
Avoid split action bar when it only has one item. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:00:37 +0000 (18:00 -0800)]
am
39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
* commit '
39b7bd8cbcd4413e8ab4dae5caa2b34f38530c95':
Use uniform font size for APNs and timezones. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 02:00:36 +0000 (18:00 -0800)]
am
5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
* commit '
5d376860e9c76c4026b824dfd4b4d295541f4fef':
Avoid split action bar when it only has one item. DO NOT MERGE.
Jeff Sharkey [Fri, 30 Nov 2012 01:58:21 +0000 (17:58 -0800)]
Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev
Jeff Sharkey [Fri, 30 Nov 2012 01:58:19 +0000 (17:58 -0800)]
Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
Jake Hamby [Fri, 30 Nov 2012 00:21:19 +0000 (16:21 -0800)]
am
fc6f304a: am
48b6e21b: am
6e8644bc: Add string resource removed by previous commit.
* commit '
fc6f304a9f5312bc0dde0ecfd93a301d0a5c6a99':
Add string resource removed by previous commit.
Jake Hamby [Fri, 30 Nov 2012 00:19:15 +0000 (16:19 -0800)]
am
48b6e21b: am
6e8644bc: Add string resource removed by previous commit.
* commit '
48b6e21b75a5da10e9840aa88f2789956483de87':
Add string resource removed by previous commit.
Jake Hamby [Fri, 30 Nov 2012 00:17:08 +0000 (16:17 -0800)]
am
6e8644bc: Add string resource removed by previous commit.
* commit '
6e8644bcca75700757977be9fab1ffc501325c3e':
Add string resource removed by previous commit.
The Android Open Source Project [Thu, 29 Nov 2012 23:44:32 +0000 (15:44 -0800)]
am
af8e1060: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
af8e106049f7993f9c2f4e008eb6973f37dd3215':
The Android Open Source Project [Thu, 29 Nov 2012 23:41:44 +0000 (15:41 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I5f455c4d385b0d72a9539104b6390abb94042277
Jake Hamby [Thu, 29 Nov 2012 23:06:20 +0000 (15:06 -0800)]
Add string resource removed by previous commit.
The "bluetooth_permission_request" string resource was removed in
a previous commit, but is still referenced by a manifest element.
Add the original string resource to strings.xml.
Bug:
7641406
Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
Jeff Sharkey [Thu, 29 Nov 2012 01:41:16 +0000 (17:41 -0800)]
Use uniform font size for APNs and timezones. DO NOT MERGE.
Also get rid of some orange highlight!
Bug:
7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
Jeff Sharkey [Thu, 29 Nov 2012 01:09:19 +0000 (17:09 -0800)]
Avoid split action bar when it only has one item. DO NOT MERGE.
Bug:
7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
Jake Hamby [Thu, 29 Nov 2012 22:37:20 +0000 (14:37 -0800)]
am
26a67fd1: am
c5190506: am
0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
* commit '
26a67fd181bc22d1d922195f32c4760ef8d7c578':
Fix Bluetooth enable dialog to match Android style guide.
Dianne Hackborn [Thu, 29 Nov 2012 22:37:18 +0000 (14:37 -0800)]
am
8afda9ef: am
ac4bfa60: am
af604801: Merge "Be quiet!" into jb-mr1.1-dev
* commit '
8afda9efce141118425e2ee8b1dca7f2466cd525':
Be quiet!
Adam Cohen [Thu, 29 Nov 2012 22:37:17 +0000 (14:37 -0800)]
am
94cdb26c: am
e38d6277: am
9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
94cdb26c409f0b8b1bc0b80d485b93bd6720a7e8':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
Irfan Sheriff [Thu, 29 Nov 2012 22:32:23 +0000 (14:32 -0800)]
Merge "Fix wifi compareTo"
Jake Hamby [Thu, 29 Nov 2012 22:28:50 +0000 (14:28 -0800)]
am
c5190506: am
0206284a: Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev
* commit '
c51905067793a3f18c94df79eb15472cbb58322f':
Fix Bluetooth enable dialog to match Android style guide.
Dianne Hackborn [Thu, 29 Nov 2012 22:26:34 +0000 (14:26 -0800)]
am
ac4bfa60: am
af604801: Merge "Be quiet!" into jb-mr1.1-dev
* commit '
ac4bfa607d8a1e3c78de25dec740637cd5906a8d':
Be quiet!
Adam Cohen [Thu, 29 Nov 2012 22:26:25 +0000 (14:26 -0800)]
am
e38d6277: am
9067d57a: Merge "Making sure keyguard and homescreen only display eligible widgets (issue
7550090)" into jb-mr1.1-dev
* commit '
e38d6277c8355cca7239deed6a6df75f852b164d':
Making sure keyguard and homescreen only display eligible widgets (issue
7550090)
OSDN Git Service
