drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,076 Commits 1 Branch 0 Tags
Commit Graph

138076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
6790b0502b Support list navigation mode for toolbar action bars 
Add support for the list(spinner) navigation mode for ToolbarActionBar
and WindowDecorActionBar when a Toolbar is substituting for an
ActionBarView.

Bug 15332084

Change-Id: Ic618686f7767c4a14410ae359435d7c1b244e4fa
 2014-06-03 16:51:25 -07:00
Winson Chung
56f4692a89 Fixing back regression in Recents. 
Change-Id: I57f4fce3f2b455085b066dd7daa91cc68844b259
 2014-06-03 16:49:00 -07:00
Ruben Brunk
3f6680ad48 Merge "DNG: Write out additional fields." into lmp-preview-dev 2014-06-03 23:38:57 +00:00
Andrew Solovay
9b8b1b6193 docs: Fixed error in code sample. 
The code sample didn't match the sample project. Also rewrote one
paragraph to clarify that you *create* a particular XML file (external
bug report said the file was missing from the sample project).

Also fixed formatting in a different line sample (overlong line
forced code box to scroll).

Doc is staged to:
http://asolovay.mtv:9098/training/contacts-provider/retrieve-names.html#NameMatch

bug: 15377898
Change-Id: I0898956255aa9174b12811e6f6ca826434b28c20
 2014-06-03 23:38:49 +00:00
Dirk Dougherty
c5d7478c95 am e21d8d7b: am 93a27e23: am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 
* commit 'e21d8d7b23f3978ad78d71a7e4b2b4311035d679':
  Adjust h3 margins for dynamic content blocks.
 2014-06-03 23:21:46 +00:00
Dirk Dougherty
e21d8d7b23 am 93a27e23: am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 
* commit '93a27e236b88636e68543d5edd80e5a5c176fb57':
  Adjust h3 margins for dynamic content blocks.
 2014-06-03 23:18:15 +00:00
Dirk Dougherty
93a27e236b am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 
* commit '7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
  Adjust h3 margins for dynamic content blocks.
 2014-06-03 23:13:50 +00:00
Dirk Dougherty
7f0c6478ae Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 2014-06-03 23:09:37 +00:00
John Spurlock
856edebad7 Zen: Stateful condition panel. 
When DND is on, expanded panel shows the current time
condition, or time remaining.  The last time bucket
selected is remembered as the default option for the
next time.

Move the server-side countdown helper into a proper
condition provider, but register it in-process as a
system provider.

Move common countdown condition parsing into ZenModeConfig
to reuse from system components.

Keep the manual exit condition around in zen mode config
and add plumbing for getting / listening to the
controller.

Keep the last QS detail panel around instead of
recreating it every time.

Fix the time condition's plus and minus button
enabling logic, and enhance the click handler to
deal properly with the next or previous bucket.

Bug:15344758
Change-Id: Ie7018a1c20e20f6d7e5f9e7874188374e6f8e2ab
 2014-06-03 19:05:55 -04:00
Alan Viverette
3567140b04 Temporary drawable for Quantum progress indicator 
Also cleans up unused 20dp spinner drawables.

Change-Id: I69aba84eca9f9e8d44a4237d894015caeb3d2308
 2014-06-03 16:02:26 -07:00
Tim Murray
e039531817 am fbd6fe04: (-s ours) am 1afc29ae: Merge "Add support for mixed 32/64 APKs using RenderScript." 
* commit 'fbd6fe04fb26eb94d2fe131dd18a5f37b3d3e52d':
  Add support for mixed 32/64 APKs using RenderScript.
 2014-06-03 22:58:12 +00:00
Alan Viverette
a48e7b5500 Merge "Fix build, fix Drawable loop" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Alan Viverette
55a54e17df Merge "Update theme colors, fix EditText state transition" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Alan Viverette
bd4d1c31f3 Merge "Set starting value on ripple exit animation" into lmp-preview-dev 2014-06-03 22:49:33 +00:00
Alan Viverette
910a0b4d02 Fix build, fix Drawable loop 
Change-Id: I524b7f40c700ebe601fdbe80644a46e90ab2bba0
 2014-06-03 15:48:30 -07:00
Craig Mautner
22af5b8428 am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 
* commit '81dfc082d2add8463469e3eac9db94d6d93005ce':
  Force all windows to redraw before unblanking screen
 2014-06-03 22:44:52 +00:00
Craig Mautner
81dfc082d2 Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 2014-06-03 22:41:38 +00:00
Tim Murray
56f9e6f8d5 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 15:11:37 -07:00
Ruben Brunk
b8df8e07d6 DNG: Write out additional fields. 
Bug: 15112503

Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
 2014-06-03 15:07:50 -07:00
Igor Murashkin
0b27d3453d camera2: Implement most of CameraCaptureSession 
Bug: 14964443
Change-Id: I8203842c77a94a3a6e5f89494fce658b00a4160d
 2014-06-03 14:55:52 -07:00
Tim Murray
fbd6fe04fb am 1afc29ae: Merge "Add support for mixed 32/64 APKs using RenderScript." 
* commit '1afc29ae3895f7362e50f1d7b9f35bb689c96140':
  Add support for mixed 32/64 APKs using RenderScript.
 2014-06-03 21:52:53 +00:00
Craig Mautner
3ad30bf6d8 Merge "Layout keyguard according to flags." into lmp-preview-dev 2014-06-03 21:49:31 +00:00
Alan Viverette
dcf7b59f84 Update theme colors, fix EditText state transition 
BUG: 11218747
BUG: 15200201
Change-Id: I94368897ea9466ae971b25fc80d6ca43433aadd5
 2014-06-03 14:43:38 -07:00
Alan Viverette
c213c7a152 Merge "Quantum tab indicators, clean up text appearances" into lmp-preview-dev 2014-06-03 21:39:04 +00:00
Craig Mautner
beac1064f1 Layout keyguard according to flags. 
Keyguard layout was being skipped because the previous policy does
not layout the status bar. This change lays out the status bar when
it is serving as the keyguard. This change then allows the keyguard
insets to be resized to make room for the IME when password security
is selected.

Fixes bug 14548156.

Change-Id: Ice4f1072b463a22ec763a0cde69f342206bdd15a
 2014-06-03 14:38:57 -07:00
Tim Murray
1afc29ae38 Merge "Add support for mixed 32/64 APKs using RenderScript." 2014-06-03 21:36:19 +00:00
ztenghui
422b38f1a0 Merge "Add AnimationDrawable test" 2014-06-03 21:36:13 +00:00
Jorim Jaggi
6539a83f77 Go back to keyguard when in SHADE_LOCKED with single tap. 
Bug: 15188946
Change-Id: Iee9f1572bd25a5fc9f1ad7e182746a6f09a49f6d
 2014-06-03 23:33:09 +02:00
ztenghui
7ac18b8445 Add AnimationDrawable test 
Change-Id: Ieabd1f628cdccd4939f733f92c0cbefbf8bc0446
 2014-06-03 14:26:29 -07:00
Deepanshu Gupta
b6abd08dcc am 3fedec19: (-s ours) am 2e78de7f: am 92641015: am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3fedec19e6efc22755b1e2e4bed67615d2acb9c2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:25:17 +00:00
Deepanshu Gupta
3fedec19e6 am 2e78de7f: am 92641015: am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2e78de7f37fd2fb8666e31a610aeb0efba5ad626':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:21:30 +00:00
Deepanshu Gupta
2e78de7f37 am 92641015: am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '92641015c83ec027f0d06b8047804f5ffc2dc16b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:17:09 +00:00
Alan Viverette
560ad617cb Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev 2014-06-03 21:11:27 +00:00
Deepanshu Gupta
92641015c8 am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '5f664a1119f9008feeb924ec50c2ac896a8550db':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:10:10 +00:00
Deepanshu Gupta
5f664a1119 am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2a57694d0ae30eeca7239c7efae4e6bf478b781a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:06:02 +00:00
Deepanshu Gupta
2a57694d0a am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:02:55 +00:00
Deepanshu Gupta
af7649bc00 am 6eff9e54: (-s ours) am 728e72df: am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '6eff9e54ebcc9d416ba008a0106708240f3abf9b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:00:52 +00:00
Deepanshu Gupta
ae7bee94e8 am d76ac501: (-s ours) am 46a156a6: am 7e49737d: am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'd76ac50187226d08937235b441a142164576533a':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 21:00:47 +00:00
Deepanshu Gupta
e2edd753e8 am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '76364c6970f86bdf67622c14c9f1ebac6883998b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:58:41 +00:00
Deepanshu Gupta
6eff9e54eb am 728e72df: am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '728e72df9ded3ad4b007b0c615aec6d03ab0b789':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:57:43 +00:00
Deepanshu Gupta
d76ac50187 am 46a156a6: am 7e49737d: am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '46a156a6d0c54506d835d350b97dd855b7821729':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:57:40 +00:00
Deepanshu Gupta
728e72df9d am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:54:31 +00:00
Deepanshu Gupta
46a156a6d0 am 7e49737d: am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '7e49737d80fa37731af44dff2f88a6054778f907':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:54:29 +00:00
Deepanshu Gupta
76364c6970 am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:53:49 +00:00
Deepanshu Gupta
e81cafe113 am 896bdbea: (-s ours) am 01041ec0: am 7e0b1d59: am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '896bdbea56b5a5b7dfe82c559dd11437bff5adf5':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:50:33 +00:00
Deepanshu Gupta
d0f215756a am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:37 +00:00
Deepanshu Gupta
2bc3df2e3c am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:35 +00:00
Deepanshu Gupta
7e49737d80 am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fb6e2f3b56fc067c634c122d605abe3841c309a9':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:49:32 +00:00
Adam Lesinski
8ee244355b resolved conflicts for merge of 522c5ce2 to master 
Change-Id: I15c7f78e9c81947e33270251d7b50e592fb61583
 2014-06-03 13:47:54 -07:00
Deepanshu Gupta
b97ac2b6ac am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'c8414f11d7738dafc530178fd6dfa365d8b3d884':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:47:34 +00:00