Jeff Sharkey
28c05ee893
Item layout tweaking, hook up more assets.
...
Update layouts for items in both list and grid mode to reflect
latest UX. Use new card background in grid mode, and apply gradient
treatment over thumbnails.
Visibly mark currently selected root.
Bug: 10510022
Change-Id: I36b290d7082b5cdfd7b3167df7d976032bc01bd6
2013-09-06 13:57:57 -07:00
Jeff Sharkey
e6bbcaf0bc
Merge "Another asset drop, provider icons, tests." into klp-dev
2013-09-06 20:57:39 +00:00
Stan Chesnutt
8183aac3eb
Simplistic fix for initialization race
...
The monkey run described in the bug report hits this server at a
vulnerable point, and the RuntimeException causes a subsequent NPE.
Note that I'm making this fixup CL "blind", as monkey running on
my platform (mantaray) doesn't show this specific failure.
http://b/9438025
Change-Id: I8e16cf5cfc21dcf3061f31b0741525881bbf9724
2013-09-06 13:57:16 -07:00
Dianne Hackborn
81a0cb158b
am c268c442: am f0ac3a6b: Merge "Fix issue #10650718 : Camera DOA on KLP" into klp-dev
...
* commit 'c268c442a154800c0a2fd3199fa4798b3dbb284c':
Fix issue #10650718 : Camera DOA on KLP
2013-09-06 13:51:00 -07:00
Victoria Lease
2139aa255e
am dfd7e1d3: am a680b17f: Merge "add NotoSansSymbols to fallback chain" into klp-dev
...
* commit 'dfd7e1d3e9f47854baaf63a2a1a836c3a2c4b276':
add NotoSansSymbols to fallback chain
2013-09-06 13:46:25 -07:00
Mathias Agopian
84e6ccf790
am e669c7ac: am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev
...
* commit 'e669c7aca3c02b9991d5a1cfcad40b5ae48faab2':
tweak the electron beam animation a bit
2013-09-06 13:46:22 -07:00
Dianne Hackborn
2949d1af93
am 5e615ee5: am a4796d51: Merge "Fix to show correct duration." into klp-dev
...
* commit '5e615ee5ad4fb02cec2c328555cf5fb4fc1ea424':
Fix to show correct duration.
2013-09-06 13:46:18 -07:00
Igor Murashkin
a94db2467c
am 76f883e0: am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev
...
* commit '76f883e0a8fa6d62110824399440c779a1b68874':
Binder: Log exceptions originating from the binder stub for oneway calls
2013-09-06 13:46:16 -07:00
Alan Viverette
fbe4a586c2
Add drag-to-open for action bar submenus
...
BUG: 10649895
Change-Id: I5076e0d09453a75ed20c44eede4b43e8a2f535fd
2013-09-06 13:45:54 -07:00
Dianne Hackborn
c268c442a1
am f0ac3a6b: Merge "Fix issue #10650718 : Camera DOA on KLP" into klp-dev
...
* commit 'f0ac3a6b04cb23aa5b7e0c1e307e3dea7de6dcc9':
Fix issue #10650718 : Camera DOA on KLP
2013-09-06 13:45:10 -07:00
Dianne Hackborn
f0ac3a6b04
Merge "Fix issue #10650718 : Camera DOA on KLP" into klp-dev
2013-09-06 20:42:29 +00:00
Victoria Lease
dfd7e1d3e9
am a680b17f: Merge "add NotoSansSymbols to fallback chain" into klp-dev
...
* commit 'a680b17fb4906570f280d4f06c0d8840a37b709a':
add NotoSansSymbols to fallback chain
2013-09-06 13:38:39 -07:00
Mathias Agopian
e669c7aca3
am 52a5096f: Merge "tweak the electron beam animation a bit" into klp-dev
...
* commit '52a5096f7cf6ef2505e182a681b0a9705bbd44bd':
tweak the electron beam animation a bit
2013-09-06 13:38:35 -07:00
Dianne Hackborn
5e615ee5ad
am a4796d51: Merge "Fix to show correct duration." into klp-dev
...
* commit 'a4796d51f6e42300ae8586741becd5ff8612c511':
Fix to show correct duration.
2013-09-06 13:38:27 -07:00
Igor Murashkin
76f883e0a8
am 034052b3: Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev
...
* commit '034052b352e14054d5271ea42985497f6b101b4f':
Binder: Log exceptions originating from the binder stub for oneway calls
2013-09-06 13:38:23 -07:00
Dianne Hackborn
d4a8b9d3c1
Fix issue #10650718 : Camera DOA on KLP
...
Methods not kept in sync.
Change-Id: I2621255707bbc569ac476b8fb0f7e82f68585b12
2013-09-06 13:36:57 -07:00
Timothy Knight
a2815faad7
Camera2: Minor docs fix.
...
Bug: 10639270
Change-Id: Ic5b046a8f8e1c8be83f010e05247914c61b3674b
2013-09-06 13:34:30 -07:00
Adam Powell
0cb1a791d8
am 435f957f: am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev
...
* commit '435f957feef58a4d393f06f57db3975633d6b09b':
Add a minimum timeout for double-tap in GestureDetector
2013-09-06 13:32:51 -07:00
David Christie
8f7b2e5683
am 8b0c6c22: am ba957652: Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the
...
* commit '8b0c6c22a296d50ee120148a9e6d4b586f454f23':
Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI.
2013-09-06 13:32:49 -07:00
Chris Craik
0ff8c5f33c
am 9b824560: am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev
...
* commit '9b824560726eab653a1044eecdb0bfe5ff804865':
Dump the right matrix when logging display lists
2013-09-06 13:32:45 -07:00
Lajos Molnar
f096f93872
am 3ec449e0: am 14add7b3: Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev
...
* commit '3ec449e0814dbb0baa518bc05372bbb3154c2e9f':
MediaPlayer.MTP: fix issue when main thread had no looper
2013-09-06 13:32:43 -07:00
Adam Powell
435f957fee
am b8b017cb: Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev
...
* commit 'b8b017cb6879352aee015ba24e9bfd05cc094e74':
Add a minimum timeout for double-tap in GestureDetector
2013-09-06 12:58:24 -07:00
David Christie
8b0c6c22a2
am ba957652: Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp
...
* commit 'ba957652bf7aa32cf09de6a5a05a3acfc8912824':
Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI.
2013-09-06 12:58:14 -07:00
Chris Craik
9b82456072
am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev
...
* commit '9b40bdf64420bf1585ccadd36d0a7d38f3c77865':
Dump the right matrix when logging display lists
2013-09-06 12:58:06 -07:00
Lajos Molnar
3ec449e081
am 14add7b3: Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev
...
* commit '14add7b3e984d07b0208c5620120556f001e25fd':
MediaPlayer.MTP: fix issue when main thread had no looper
2013-09-06 12:58:03 -07:00
Sandeep Siddhartha
4473f02003
Use the permission for hotword recognition
...
- Also fixes an issue with PendingIntents being launched from the
lockscreen taking a lot of time
Change-Id: I91b44328ba68b225454322b90a5b19a0d4c9a772
2013-09-06 12:48:51 -07:00
Victoria Lease
a680b17fb4
Merge "add NotoSansSymbols to fallback chain" into klp-dev
2013-09-06 19:40:00 +00:00
Sandeep Siddhartha
c73c178374
Add permission checks and unhide the Hotword recognition APIs
...
- Also tweak the API a little to send an intent on hotword being
recognized.
Change-Id: I8a3fedaec4e1db595ed058089734d25c7957111e
2013-09-06 12:34:03 -07:00
Dmitry Grinberg
34b0f92613
Allow L2CAP sockets
...
Change-Id: Icb498e6c0430789b6168bec3beb1d4650e4f1238
2013-09-06 12:27:12 -07:00
Mathias Agopian
52a5096f7c
Merge "tweak the electron beam animation a bit" into klp-dev
2013-09-06 19:16:37 +00:00
Dianne Hackborn
a4796d51f6
Merge "Fix to show correct duration." into klp-dev
2013-09-06 18:48:02 +00:00
Dianne Hackborn
d6d54a4694
Fix to show correct duration.
...
Change-Id: I1032d90d5b7bf39006b20f3374104421dcc53305
2013-09-06 11:46:43 -07:00
Igor Murashkin
034052b352
Merge "Binder: Log exceptions originating from the binder stub for oneway calls" into klp-dev
2013-09-06 18:32:30 +00:00
Alan Viverette
bbf4962a45
Increase visibility of accessibility focus highlight
...
Swaps old 9-patch for a Shape with a 2dp stroke and standard 2dp
rounded corner.
BUG: 9076619
Change-Id: I7486facb77c52209348830edf4eea318b1d90608
2013-09-06 11:19:26 -07:00
Adam Powell
b8b017cb68
Merge "Add a minimum timeout for double-tap in GestureDetector" into klp-dev
2013-09-06 18:15:28 +00:00
David Christie
ba957652bf
Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp-dev
2013-09-06 18:09:20 +00:00
David Christie
a2b73480c0
Fix QuickSettings to honor location setting for restricted users (b/10553306).
...
Generally when a user is location restricted, location will be off.
But just in case location is on and locked in that state, we should
respect that in the UI.
Change-Id: I112139db447ba6dbf4c7c38600406fb5ba6a1fa8
2013-09-06 10:57:00 -07:00
Jeff Sharkey
6d97d3c1a2
Another asset drop, provider icons, tests.
...
Latest asset update, including provider icons which are treated as
special cases for now instead of checking into separate apps. Add
tests for MIME type matching of roots. Remove unused XML.
Bug: 10510022
Change-Id: Id567a9e06ba241f60ac011823e550253c6c797fb
2013-09-06 10:46:54 -07:00
Chris Craik
9b40bdf644
Merge "Dump the right matrix when logging display lists" into klp-dev
2013-09-06 17:43:02 +00:00
Lajos Molnar
14add7b3e9
Merge "MediaPlayer.MTP: fix issue when main thread had no looper" into klp-dev
2013-09-06 17:40:55 +00:00
Vinit Deshapnde
9c395c8e26
am 6a3b7db2: am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev
...
* commit '6a3b7db257db3e8c6be834fe69859bf2465af380':
Fix duplicate SSID entries in the WifiSettings UI
2013-09-06 10:31:31 -07:00
Vinit Deshapnde
6a3b7db257
am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev
...
* commit '771c11b73941994d24e5da5851451ee4088499a6':
Fix duplicate SSID entries in the WifiSettings UI
2013-09-06 10:28:56 -07:00
Vinit Deshapnde
771c11b739
Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev
2013-09-06 17:26:39 +00:00
Wink Saville
4fea0413c1
Tighten test for warm sim and add more debug.
...
- Require a non-204 response multiple times before declaring a
redirected error and hence a warm sim.
- If there is no connection or dns don't declare its a warm-sim.
- Add printing of the http headers to try to get more information
if we still get a false positive result.
Bug: 9972012
Change-Id: Ic115685cdbbe39c2b4de88b128eaf8d2ea96b45c
2013-09-06 09:54:24 -07:00
Jeff Sharkey
a53fb42f31
am 775bdbdb: am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev
...
* commit '775bdbdb11ad790f45ee66e8fdf8dca3fcba969a':
Provide calling package to ContentProviders.
Separate root and document management.
2013-09-06 09:53:04 -07:00
Wink Saville
010bbf42ff
am 78f4e10b: am a1d6a9b4: am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
...
* commit '78f4e10bb206acc13095a6daeb880751fb28f313':
Do not change NetworkInfo.DetailedState.
2013-09-06 09:53:01 -07:00
Mikhail Naganov
1b48d039d3
am 708d279a: am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev
...
* commit '708d279a16e2c937da1a2247195eb738906c199e':
Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
2013-09-06 09:52:49 -07:00
Baligh Uddin
c55a29c45e
am ddde9617: (-s ours) am f96b104a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'ddde9617d62df82107252a23dc75988f67939678':
Import translations. DO NOT MERGE
2013-09-06 09:52:34 -07:00
Lorenzo Colitti
551624c46c
am 6bddc317: am eadf1959: Merge "Track IP addresses in WifiStateMachine." into klp-dev
...
* commit '6bddc317554b43818e625519e094e0381859db82':
Track IP addresses in WifiStateMachine.
2013-09-06 09:52:12 -07:00
Michael Wright
6484c0e013
Merge addition of supports-input tag into master
...
aapt has been moved out of f/b which caused merged conflicts in
the original commit
Conflicts:
tools/aapt/Command.cpp
Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b
2013-09-06 09:39:34 -07:00