121647 Commits

Author SHA1 Message Date
Deepanshu Gupta
5dee1a093a am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit 'e17ed922001cf70c48969eb7b10ee2e2557b41f9':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-04-24 01:36:14 +00:00
Deepanshu Gupta
e17ed92200 am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '126f4057a06756fbb1c194b5d9d40f9f922d14ee':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-04-24 01:31:15 +00:00
Deepanshu Gupta
126f4057a0 am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-04-24 01:27:45 +00:00
Deepanshu Gupta
5ba2f230fa Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)
2014-04-23 18:04:21 -07:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
2014-04-23 16:48:34 +00:00
Neil Fuller
caf6497b9a am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption
2014-04-23 16:45:15 +00:00
Neil Fuller
683cf1bffe Merge "Changes to support asynchronous close interruption" 2014-04-23 16:41:17 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
2014-04-23 16:40:35 +00:00
Andrew Solovay
e4593554dd am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '32117212fc48872b557044ff25ba6b8d9ace5738':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
2014-04-23 02:51:48 +00:00
Andrew Solovay
32117212fc am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
2014-04-23 02:47:50 +00:00
Andrew Solovay
6c5bfa2f34 am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '026c82b1916a9e2b48b9ff62ffeb935d63935a68':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
2014-04-23 02:44:06 +00:00
Andrew Solovay
026c82b191 Doc: Fixed a code sample to use standard methods. Also some formatting
tweaks.

Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.

(Update: Fixed indentation that I broke on a code sample.)

Bug: 14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1
2014-04-22 19:29:07 -07:00
Baligh Uddin
128f5efa76 am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '89ed56fa6c5951e4ce7ea555ae8f90c65b2daa2d':
  Import translations. DO NOT MERGE
2014-04-23 02:13:29 +00:00
Baligh Uddin
97f9607fcc am d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'd14bb3cfb95e5bebb181ec9ed08295f25b87a94f':
  Import translations. DO NOT MERGE
2014-04-23 02:08:22 +00:00
Baligh Uddin
b38d00d579 am abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'abd2a4a44923c28111bdf9ccb59e5557f0deafeb':
  Import translations. DO NOT MERGE
2014-04-23 02:08:19 +00:00
Baligh Uddin
c1c6de3f91 am c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'c2c527a6f4b3629ea271ef5444292a02e2d9a17e':
  Import translations. DO NOT MERGE
2014-04-23 02:08:13 +00:00
Baligh Uddin
6c8e9296c3 am 13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '13c48fba164a977bbf4ef64434427bab297421bf':
  Import translations. DO NOT MERGE
2014-04-23 02:08:10 +00:00
Baligh Uddin
e22700ac5b am 611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
  Import translations. DO NOT MERGE
2014-04-23 02:08:07 +00:00
Baligh Uddin
9ee5df4b12 am 4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '4516c695b2d8fdbc7dc0427a98841805e47f1e16':
  Import translations. DO NOT MERGE
2014-04-23 02:08:04 +00:00
Baligh Uddin
0d0bbe4e12 am 2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '2d45d4de489563907aebe8bb29c3b965749fe81e':
  Import translations. DO NOT MERGE
2014-04-23 02:08:00 +00:00
Baligh Uddin
c72133a485 am 5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '5eb7136de95111983bef2357e2543730f66cde03':
  Import translations. DO NOT MERGE
2014-04-23 02:07:57 +00:00
Baligh Uddin
ed8c409619 am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
  Import translations. DO NOT MERGE
2014-04-23 02:07:54 +00:00
Baligh Uddin
89ed56fa6c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:07:52 +00:00
Baligh Uddin
44cbb9f229 am 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
  Import translations. DO NOT MERGE
2014-04-23 02:07:51 +00:00
Baligh Uddin
b491f83238 am 42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
  Import translations. DO NOT MERGE
2014-04-23 02:07:48 +00:00
Baligh Uddin
61f9ac26fd am 9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '9dbd2eebf9095c4513b333a1ccce12e7d4523bd1':
  Import translations. DO NOT MERGE
2014-04-23 02:07:45 +00:00
Baligh Uddin
d14bb3cfb9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:10 +00:00
Baligh Uddin
abd2a4a449 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:06 +00:00
Baligh Uddin
c2c527a6f4 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
13c48fba16 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
611dd7b70a Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
4516c695b2 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:57 +00:00
Baligh Uddin
2d45d4de48 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:57 +00:00
Baligh Uddin
5eb7136de9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:55 +00:00
Baligh Uddin
71b82aedca Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:55 +00:00
Baligh Uddin
2d6e077d1d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:48 +00:00
Baligh Uddin
42c0488a4b Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:44 +00:00
Baligh Uddin
9dbd2eebf9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:41 +00:00
Jeff Brown
62271b9522 am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
  Fix HDMI hotplug display blanking behavior.
2014-04-23 01:22:26 +00:00
Jeff Brown
3af3926749 Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 2014-04-23 01:20:01 +00:00
Jeff Brown
44b1f76474 Fix HDMI hotplug display blanking behavior.
Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
2014-04-22 18:07:24 -07:00
Baligh Uddin
cf361e2670 Import translations. DO NOT MERGE
Change-Id: Ieceadfdafb3e1353a30494c8a9731efcf91b9e8b
Auto-generated-cl: translation import
2014-04-22 17:54:46 -07:00
Baligh Uddin
2e9dc0e241 Import translations. DO NOT MERGE
Change-Id: Iae8e8f588200714d11fe7dced5aab7ec63181e8f
Auto-generated-cl: translation import
2014-04-22 17:12:07 -07:00
Ying Wang
d12bf27575 am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
2014-04-23 00:11:52 +00:00
Baligh Uddin
c0be1c09ca Import translations. DO NOT MERGE
Change-Id: Idf24bec3b74bbe1abc88c2a3c2da451be9ed5c02
Auto-generated-cl: translation import
2014-04-22 17:11:22 -07:00
Ying Wang
d0dc898119 Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev 2014-04-23 00:10:01 +00:00
Baligh Uddin
3870b9dd83 Import translations. DO NOT MERGE
Change-Id: I3106f51a639078291c298ca4bbd75062e788a313
Auto-generated-cl: translation import
2014-04-22 17:09:18 -07:00
Baligh Uddin
1fa38d2165 Import translations. DO NOT MERGE
Change-Id: I1aa31fe5b005c2cdef0b250806d682141cdf4fc3
Auto-generated-cl: translation import
2014-04-22 17:08:37 -07:00
Baligh Uddin
8e54756f90 Import translations. DO NOT MERGE
Change-Id: I236254c3ae3302004f19821a7d7022ae49f6e908
Auto-generated-cl: translation import
2014-04-22 17:05:01 -07:00
Baligh Uddin
bd41f66b90 Import translations. DO NOT MERGE
Change-Id: Ia514ffa26785292a7659a5e3950cc3125d50736e
Auto-generated-cl: translation import
2014-04-22 17:04:17 -07:00