OSDN Git Service
Jorim Jaggi [Wed, 4 Jun 2014 20:52:33 +0000 (20:52 +0000)]
am
34ed4600: Merge "Fix padding in more card." into lmp-preview-dev
* commit '
34ed46008c725ae3893f23875f3012e35efc5edb':
Fix padding in more card.
Selim Cinek [Wed, 4 Jun 2014 20:52:25 +0000 (20:52 +0000)]
am
246265c2: Merge "In the speedbump view, use hasOverlappingRenderings instead of layers" into lmp-preview-dev
* commit '
246265c228da399b7b894c158c713f06396538ec':
In the speedbump view, use hasOverlappingRenderings instead of layers
Selim Cinek [Wed, 4 Jun 2014 20:52:20 +0000 (20:52 +0000)]
am
dd225891: Merge "Disabled touch interaction when in Quick settings." into lmp-preview-dev
* commit '
dd225891718fa79378e3ec8119aafa0dbb17a82e':
Disabled touch interaction when in Quick settings.
Adrian Roos [Wed, 4 Jun 2014 20:52:14 +0000 (20:52 +0000)]
am
612734fb: Merge "Display time to charge on lock screen" into lmp-preview-dev
* commit '
612734fbfa24b925d51dcf47260a87290629f220':
Display time to charge on lock screen
Selim Cinek [Wed, 4 Jun 2014 20:52:08 +0000 (20:52 +0000)]
am
b8bf46b2: Merge "Fixed that app-info longpress was lost on configuration changes." into lmp-preview-dev
* commit '
b8bf46b250c7f299d6fcfe7942fdbfabb688f27a':
Fixed that app-info longpress was lost on configuration changes.
Selim Cinek [Wed, 4 Jun 2014 20:52:03 +0000 (20:52 +0000)]
am
a4e01205: Merge "Changed the overscroll and expanding behaviour." into lmp-preview-dev
* commit '
a4e01205c0782dccfe56597bd1144c75b4e08081':
Changed the overscroll and expanding behaviour.
Jorim Jaggi [Wed, 4 Jun 2014 20:51:58 +0000 (20:51 +0000)]
am
af4418ff: Merge "Fix more card appearance to spec from design." into lmp-preview-dev
* commit '
af4418ffb2b5bf289f85fb91a47fc63fc36949cd':
Fix more card appearance to spec from design.
George Mount [Wed, 4 Jun 2014 20:51:52 +0000 (20:51 +0000)]
am
46e2688a: Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev
* commit '
46e2688a20758d8529ccd3da83a0fcbbf3e8b5fb':
Create reasonable Activity Transition defaults for quantum theme.
Deepanshu Gupta [Wed, 4 Jun 2014 20:43:08 +0000 (20:43 +0000)]
am
9f213b1e: (-s ours) am
46c3beef: am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
9f213b1e2b2db2589cbe2f6554fd6e18ed871bad':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:43:02 +0000 (20:43 +0000)]
am
3c15d8d6: (-s ours) am
14104896: am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
3c15d8d6889806d0b517eec03ed6a4f8728ebc16':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:42:07 +0000 (20:42 +0000)]
Merge "Distinguish between menus in ActionBar and popup."
Deepanshu Gupta [Wed, 4 Jun 2014 20:36:35 +0000 (20:36 +0000)]
am
f2862a84: (-s ours) am
4da5807c: am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:32:50 +0000 (20:32 +0000)]
am
46c3beef: am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
46c3beefad751fde9ba44d092a947df49d94219a':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:32:46 +0000 (20:32 +0000)]
am
14104896: am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
14104896770dd26195cd9ccfac8c1604cb95dbc6':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:32:43 +0000 (20:32 +0000)]
am
4da5807c: am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
4da5807ce0e6a190c5e1de37297d454368906e76':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:11 +0000 (20:29 +0000)]
am
3ce1ca68: am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
3ce1ca68309231e693964824917a66f36e575fd7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:06 +0000 (20:29 +0000)]
am
e4aa3138: am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
e4aa31382139ee2e319110fbfff402e0c6315952':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:29:03 +0000 (20:29 +0000)]
am
88c9ca28: am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:26:07 +0000 (20:26 +0000)]
am
0ed9d498: am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
0ed9d498b740273fdbcdf51f55648c23df29accc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:25:57 +0000 (20:25 +0000)]
am
a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '
a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:25:54 +0000 (20:25 +0000)]
am
d49f9b25: am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
d49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:52 +0000 (20:20 +0000)]
am
328b1f92: (-s ours) am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:51 +0000 (20:20 +0000)]
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:27 +0000 (20:20 +0000)]
am
2983ee55: (-s ours) am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:20:26 +0000 (20:20 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 15 May 2014 16:32:12 +0000 (09:32 -0700)]
Distinguish between menus in ActionBar and popup.
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.
Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit
f542f28a31b38a4e454535a1fea63968811b418c)
Deepanshu Gupta [Wed, 4 Jun 2014 20:15:37 +0000 (20:15 +0000)]
am
5d3e3851: am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:15:33 +0000 (20:15 +0000)]
am
12b657d7: am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
12b657d74961ba5a6175162b7548cce4e77c9bbc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:23 +0000 (20:11 +0000)]
am
af3f96e4: am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
af3f96e4349f63f862de004853ba8e10e5ee51ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:11:19 +0000 (20:11 +0000)]
am
dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit '
dade24b491c82ff0b96d025c908e7eaf1bab99ba':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:08:29 +0000 (20:08 +0000)]
am
e87c63e0: (-s ours) am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 20:07:43 +0000 (20:07 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
Jorim Jaggi [Wed, 4 Jun 2014 20:05:01 +0000 (20:05 +0000)]
am
35cfe4c1: Merge "Go back to keyguard when in SHADE_LOCKED with single tap." into lmp-preview-dev
* commit '
35cfe4c1f216f477d2c024d53a6f2c1a0d817f53':
Go back to keyguard when in SHADE_LOCKED with single tap.
Adrian Roos [Wed, 4 Jun 2014 20:04:55 +0000 (20:04 +0000)]
am
b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev
* commit '
b2302d437fd636d9973f466062cfad145cdd042d':
Ensure trust agents are only provided by platform packages
Deepanshu Gupta [Wed, 4 Jun 2014 19:43:09 +0000 (19:43 +0000)]
am
d2dff39b: am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
d2dff39b587bd073fcf5c97753c8a29e16f4ef57':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Michael Wright [Wed, 4 Jun 2014 19:41:59 +0000 (19:41 +0000)]
Merge "Making KEYCODE_PAIRING a wakeup key."
Michael Wright [Wed, 4 Jun 2014 19:38:18 +0000 (12:38 -0700)]
Making KEYCODE_PAIRING a wakeup key.
Bug:
15430207
Change-Id: I4bb862e22d32af1a89741d39a694b790aa52dfcd
Deepanshu Gupta [Wed, 4 Jun 2014 19:38:01 +0000 (19:38 +0000)]
am
b1ca2a0c: am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:34:15 +0000 (19:34 +0000)]
am
f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
f52fcc70541224c2d926f59461bde5a8bd6545a7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Deepanshu Gupta [Wed, 4 Jun 2014 19:31:31 +0000 (19:31 +0000)]
Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
John Spurlock [Wed, 4 Jun 2014 18:57:03 +0000 (18:57 +0000)]
am
50246b7f: Merge "QuickSettings: Filter signal assets with color filter." into lmp-preview-dev
* commit '
50246b7f8812e1bc7a9d961e5251d1bac4415d02':
QuickSettings: Filter signal assets with color filter.
John Spurlock [Wed, 4 Jun 2014 18:56:58 +0000 (18:56 +0000)]
am
9ffa855f: QuickSettings: Remove outlined version of location icon.
* commit '
9ffa855fd9e9fd1e44b53a5a9dbfb9fd51d2b079':
QuickSettings: Remove outlined version of location icon.
Robert Greenwalt [Wed, 4 Jun 2014 18:48:43 +0000 (18:48 +0000)]
Merge "Report new network scores back to factories."
Lorenzo Colitti [Wed, 4 Jun 2014 18:46:31 +0000 (18:46 +0000)]
am
7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev
* commit '
7a3077a9a7405048b9cd28452efbc28a857acb25':
Make requests for restricted networks not require unrestricted access.
Baligh Uddin [Wed, 4 Jun 2014 18:46:21 +0000 (18:46 +0000)]
am
69600869: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '
696008695b30e9e6baf13f5e5100ec8fda9bc65f':
Import translations. DO NOT MERGE
John Spurlock [Wed, 4 Jun 2014 18:46:14 +0000 (18:46 +0000)]
am
d4ac66cc: QuickSettings: Tile label string updates.
* commit '
d4ac66cc168f26cf89eafe2e506c631121ac27fd':
QuickSettings: Tile label string updates.
Baligh Uddin [Wed, 4 Jun 2014 18:46:09 +0000 (18:46 +0000)]
am
c4f11b67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '
c4f11b67af23dd4290864efdd1e0cb313273f207':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Jun 2014 18:46:04 +0000 (18:46 +0000)]
am
99b270af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '
99b270af17fc5dccce90d2aa29e1498ee39de802':
Import translations. DO NOT MERGE
John Spurlock [Wed, 4 Jun 2014 18:45:32 +0000 (18:45 +0000)]
am
b0570a49: Merge "QuickSettings: System accent color for seekbars." into lmp-preview-dev
* commit '
b0570a49353d696da69d3bb19216190613075981':
QuickSettings: System accent color for seekbars.
Alan Viverette [Wed, 4 Jun 2014 18:45:24 +0000 (18:45 +0000)]
am
4dd60289: Merge "Fix RadialTimePicker styling" into lmp-preview-dev
* commit '
4dd60289af766c9a256b57a3d1a8662131d28230':
Fix RadialTimePicker styling
Adam Powell [Wed, 4 Jun 2014 18:45:19 +0000 (18:45 +0000)]
am
379b49bb: Fix some brain itch.
* commit '
379b49bbc5088320d6f8f2fce88a70b458e80cf7':
Fix some brain itch.
Alan Viverette [Wed, 4 Jun 2014 18:45:10 +0000 (18:45 +0000)]
am
1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev
* commit '
1604d6302a3db07a57827b1c38f7fda21c28d3c6':
Fix action bar menu inflation context
Adam Powell [Wed, 4 Jun 2014 18:45:04 +0000 (18:45 +0000)]
am
5519852e: Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev
* commit '
5519852e01a646af65efeee30f5b8e80c2cd87e7':
Implement action bar tab mode for Toolbar-based decor action bars
Robert Greenwalt [Wed, 4 Jun 2014 18:44:59 +0000 (18:44 +0000)]
am
cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev
* commit '
cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
Fix legacy APIs.
Winson Chung [Wed, 4 Jun 2014 18:44:54 +0000 (18:44 +0000)]
am
11aef2b8: Merge "Fixing back regression in Recents." into lmp-preview-dev
* commit '
11aef2b8caddc5aaf573ab52128a8bdb2afe37d1':
Fixing back regression in Recents.
Igor Murashkin [Wed, 4 Jun 2014 18:44:46 +0000 (18:44 +0000)]
am
1a68eb96: Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev
* commit '
1a68eb968f77af341a60708b85072ae805e6dc10':
camera2: Implement most of CameraCaptureSession
Dianne Hackborn [Wed, 4 Jun 2014 18:44:37 +0000 (18:44 +0000)]
am
b96802d0: Merge "Force write battery stats after a --history-since." into lmp-preview-dev
* commit '
b96802d03cc5eb047a2be711a8d14d82498753e7':
Force write battery stats after a --history-since.
Raph Levien [Wed, 4 Jun 2014 18:44:32 +0000 (18:44 +0000)]
am
aef648f4: Merge "Better Minikin integration" into lmp-preview-dev
* commit '
aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
Better Minikin integration
Eric Laurent [Wed, 4 Jun 2014 18:44:26 +0000 (18:44 +0000)]
am
dd76759d: Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev
* commit '
dd76759d3e279cd56d6b1ce16a0b9488af35e0ab':
AudioManager: fix AudioPort gain query
Craig Mautner [Wed, 4 Jun 2014 18:44:16 +0000 (18:44 +0000)]
am
05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev
* commit '
05cd6c39824653e0f7e8641444a7134e8cac72f4':
Force all windows to redraw before unblanking screen
Alan Viverette [Wed, 4 Jun 2014 18:44:09 +0000 (18:44 +0000)]
am
62ea9554: Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev
* commit '
62ea9554753820df25343e52e0dcab090e5755b5':
Temporary drawable for Quantum progress indicator
Adam Powell [Wed, 4 Jun 2014 18:44:02 +0000 (18:44 +0000)]
am
ab9906c0: Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev
* commit '
ab9906c0735fb22017f3d673207897347edeba92':
Support list navigation mode for toolbar action bars
Ruben Brunk [Wed, 4 Jun 2014 18:43:50 +0000 (18:43 +0000)]
am
c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev
* commit '
c354b06955508816af29daefdac5ef9ea9b89fbb':
DNG: Write out additional fields.
John Spurlock [Wed, 4 Jun 2014 18:43:37 +0000 (18:43 +0000)]
am
7e127344: Zen: Stateful condition panel.
* commit '
7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
Zen: Stateful condition panel.
Alan Viverette [Wed, 4 Jun 2014 18:43:23 +0000 (18:43 +0000)]
am
15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev
* commit '
15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
Fix build, fix Drawable loop
Alan Viverette [Wed, 4 Jun 2014 18:42:06 +0000 (11:42 -0700)]
Merge commit '
096d52fb' into manualmerge
Conflicts:
api/current.txt
Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
Robert Greenwalt [Tue, 3 Jun 2014 23:43:57 +0000 (16:43 -0700)]
Report new network scores back to factories.
This is a first order approx of what we want - should probably be good enough in most cases.
bug:
15277751
Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
Alan Viverette [Wed, 4 Jun 2014 18:09:52 +0000 (18:09 +0000)]
am
a929b2d4: Merge "Set starting value on ripple exit animation" into lmp-preview-dev
* commit '
a929b2d49386cfb3cdf4e0eaecca61184fa0c857':
Set starting value on ripple exit animation
Craig Mautner [Wed, 4 Jun 2014 18:09:26 +0000 (18:09 +0000)]
am
43631db9: Merge "Layout keyguard according to flags." into lmp-preview-dev
* commit '
43631db9093a87529a5c1b2732b7102398bbfd2f':
Layout keyguard according to flags.
Alan Viverette [Wed, 4 Jun 2014 18:09:21 +0000 (18:09 +0000)]
am
4d75314b: Merge "Quantum tab indicators, clean up text appearances" into lmp-preview-dev
* commit '
4d75314b5b03cacffddcd15aea7b5172f89b0512':
Quantum tab indicators, clean up text appearances
Alan Viverette [Wed, 4 Jun 2014 18:09:14 +0000 (18:09 +0000)]
am
cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev
* commit '
cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
Fix drawable cache, add quantum assets to preload list
Jorim Jaggi [Wed, 4 Jun 2014 18:09:08 +0000 (18:09 +0000)]
am
b733f632: Merge "Move owner info to main lockscreen." into lmp-preview-dev
* commit '
b733f6322870f06d75a020f0f9f0bbba634875e7':
Move owner info to main lockscreen.
Jorim Jaggi [Wed, 4 Jun 2014 18:09:01 +0000 (18:09 +0000)]
am
7a49d92b: Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev
* commit '
7a49d92bf6fd23af7dff29fd3cb97fcd5c05cfc9':
Fix invalid Keyguard state with encrypted devices.
Chris Wren [Wed, 4 Jun 2014 18:08:52 +0000 (18:08 +0000)]
am
02dc5023: Handle Zen Mode computations correctly for updated notifications.
* commit '
02dc50231e5a3d5754281f819df418793260f526':
Handle Zen Mode computations correctly for updated notifications.
Chris Wren [Wed, 4 Jun 2014 18:08:48 +0000 (18:08 +0000)]
am
1e58ac1d: Merge "Apply Zen Mode later, after we\'ve found the old record." into lmp-preview-dev
* commit '
1e58ac1d71b630435c3e69180d9e92662c6f65dd':
Apply Zen Mode later, after we've found the old record.
Jorim Jaggi [Wed, 4 Jun 2014 18:08:43 +0000 (18:08 +0000)]
am
d98ab64e: Merge "Animate unlock icon while unlocking." into lmp-preview-dev
* commit '
d98ab64eeb3f12db6a0664dbd3871abe1d18452a':
Animate unlock icon while unlocking.
Jorim Jaggi [Wed, 4 Jun 2014 18:08:28 +0000 (18:08 +0000)]
am
4aeb033a: Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev
* commit '
4aeb033aff7259cbffe01931902a9b520ab4648f':
Fix fake status bar not visible in SHADE_LOCKED state.
Alan Viverette [Wed, 4 Jun 2014 18:08:22 +0000 (18:08 +0000)]
am
b1c7f7f5: Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev
* commit '
b1c7f7f538e8c4947f75406cc6089f6680f59a31':
Fix NPE when ripples are canceled due to visibility change
Winson Chung [Wed, 4 Jun 2014 18:08:08 +0000 (18:08 +0000)]
am
7b7f89fb: Merge "Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug.
15157307)" into lmp-preview-dev
* commit '
7b7f89fb4b08e81c80821078f92c908f80b21e1e':
Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug.
15157307)
Tim Murray [Wed, 4 Jun 2014 17:59:53 +0000 (17:59 +0000)]
am
dddd2625: (-s ours) am
af2e7bc2: (-s ours) am
fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.
* commit '
dddd2625585c80a16f47ef9322a5dee93094c9df':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Tim Murray [Wed, 4 Jun 2014 17:56:02 +0000 (17:56 +0000)]
am
af2e7bc2: (-s ours) am
fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.
* commit '
af2e7bc2e0784efd883b495a20aaffa374e8a840':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Andrew Solovay [Wed, 4 Jun 2014 17:54:38 +0000 (17:54 +0000)]
am
750d537a: am
c2086e09: am
15ceb87a: am
2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
* commit '
750d537acf9f76f8dee18bf256b8ebbac4c460bc':
docs: Fixed error in code sample.
Ricardo Cervera [Wed, 4 Jun 2014 17:54:30 +0000 (17:54 +0000)]
am
d53f1bd0: am
234474d5: am
693a9546: am
6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
* commit '
d53f1bd0e4a00677c12d38cfd525b5592d352fd7':
docs: Added release notes for SDK Tools 22.6.4
Andrew Solovay [Wed, 4 Jun 2014 17:43:24 +0000 (17:43 +0000)]
am
c2086e09: am
15ceb87a: am
2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
* commit '
c2086e09df1fa5b0f147f9474a9dd924f487468f':
docs: Fixed error in code sample.
Andrew Solovay [Wed, 4 Jun 2014 17:40:03 +0000 (17:40 +0000)]
am
15ceb87a: am
2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
* commit '
15ceb87a07d9ad1fba4265112492e34c5cc360f5':
docs: Fixed error in code sample.
Tim Murray [Wed, 4 Jun 2014 17:39:54 +0000 (17:39 +0000)]
am
fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.
* commit '
fdb15a76a30de169aac63d4c2260aa293477557e':
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Andrew Solovay [Wed, 4 Jun 2014 17:35:45 +0000 (17:35 +0000)]
am
2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs
* commit '
2e10cc9021b1cd3d90c55038191872f29a02c3f2':
docs: Fixed error in code sample.
Ricardo Cervera [Wed, 4 Jun 2014 17:34:06 +0000 (17:34 +0000)]
am
234474d5: am
693a9546: am
6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
* commit '
234474d565e668935a97bc6719ddee5c6d8d8b43':
docs: Added release notes for SDK Tools 22.6.4
Andrew Solovay [Wed, 4 Jun 2014 17:32:46 +0000 (17:32 +0000)]
Merge "docs: Fixed error in code sample." into klp-docs
Ricardo Cervera [Wed, 4 Jun 2014 17:29:36 +0000 (17:29 +0000)]
am
693a9546: am
6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
* commit '
693a954626866e40b01264ff57fe6c336a7504a8':
docs: Added release notes for SDK Tools 22.6.4
Tim Murray [Fri, 31 Jan 2014 20:57:20 +0000 (12:57 -0800)]
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
Ricardo Cervera [Wed, 4 Jun 2014 17:24:35 +0000 (17:24 +0000)]
am
6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
* commit '
6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
docs: Added release notes for SDK Tools 22.6.4
Ricardo Cervera [Wed, 4 Jun 2014 17:21:38 +0000 (17:21 +0000)]
Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs
Hector Dearman [Wed, 4 Jun 2014 17:12:35 +0000 (17:12 +0000)]
Merge "Removes bad comment from CookieManager"
Robert Greenwalt [Wed, 4 Jun 2014 17:03:25 +0000 (17:03 +0000)]
am
e8f910c6: Fix Legacy NetworkInfo API
* commit '
e8f910c635710e4b2d7f299ba33f6205cc4371e3':
Fix Legacy NetworkInfo API
Jorim Jaggi [Wed, 4 Jun 2014 17:03:18 +0000 (17:03 +0000)]
am
ec90358d: Improve hint animations.
* commit '
ec90358dbca10cdc6a162ef42baddbf509614f14':
Improve hint animations.
Jorim Jaggi [Wed, 4 Jun 2014 17:03:12 +0000 (17:03 +0000)]
am
b1c204fe: Hint for phone and camera.
* commit '
b1c204fe534cc17a8a801e50a83ab747e94d4472':
Hint for phone and camera.
Jorim Jaggi [Wed, 4 Jun 2014 17:03:05 +0000 (17:03 +0000)]
am
a573bcb6: Hide phone/camera affordance when unlocking.
* commit '
a573bcb69bae182da33f3a7be830eaf9995f817e':
Hide phone/camera affordance when unlocking.
Adrian Roos [Wed, 4 Jun 2014 17:03:01 +0000 (17:03 +0000)]
am
8d0c8451: (-s ours) Merge "Disable now defunct touch analysis facility - DO NOT MERGE" into lmp-preview-dev
* commit '
8d0c84512cb1d1fa7b2be072df0b8d9c1e16d837':
Disable now defunct touch analysis facility - DO NOT MERGE
Jungshik Jang [Wed, 4 Jun 2014 17:02:32 +0000 (17:02 +0000)]
am
20909bb0: (-s ours) Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev
* commit '
20909bb03bf636c6168ad19ccb481c7961fdb8a4':
DO NOT MERGE: Added missing entries in the cec device array
OSDN Git Service
