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

87586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick@google.com
422b19592f am 76b1be8b: am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '76b1be8b78bbb1bdfaf78a848c20b77cb7b0dedf':
  Doc Update: param name change
 2012-11-12 15:05:58 -08:00
kmccormick@google.com
76b1be8b78 am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '39cc8f8079412f721c5003cd2d0cb07366b77da4':
  Doc Update: param name change
 2012-11-12 15:02:55 -08:00
Quddus Chong
fabcff5c46 Merge "docs: Added new docs for uiautomator testing framework." into jb-mr1-dev 2012-11-12 15:02:34 -08:00
kmccormick@google.com
39cc8f8079 am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs 
* commit '4233c939014c39ce9d95556db1b654e906f8ce5b':
  Doc Update: param name change
 2012-11-12 15:00:12 -08:00
&& repo sync -j8
4233c93901 Merge "Doc Update: param name change" into jb-dev-docs 2012-11-12 14:56:58 -08:00
&& repo sync -j8
2128ec9892 Doc Update: param name change 
Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a
 2012-11-12 14:45:08 -08:00
Joe Fernandez
95d5be9ece am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '0edd4d058e6bf495566961bc52a144cc8a5c21af':
  docs: NDK r8c Release Notes
 2012-11-12 14:37:24 -08:00
Joe Fernandez
fbaa232c1c am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'dddb1e56d1155327864938373b8b89453024bbea':
  docs: JOBB tool help page
 2012-11-12 14:37:19 -08:00
Joe Fernandez
0edd4d058e am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '180200c2c126fc7db1a86ac49a235f40d1905731':
  docs: NDK r8c Release Notes
 2012-11-12 14:35:27 -08:00
Joe Fernandez
dddb1e56d1 am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit '1c350fa458a6894abb7d4213d65c1c2833faaa7a':
  docs: JOBB tool help page
 2012-11-12 14:33:44 -08:00
Joe Fernandez
180200c2c1 am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit 'aac29f126ea8c42313a5481b4871828bbd40b4a6':
  docs: NDK r8c Release Notes
 2012-11-12 14:30:31 -08:00
Joe Fernandez
1c350fa458 am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'cee5dab6752a9e793f620981014f3b7cc4f8c137':
  docs: JOBB tool help page
 2012-11-12 14:29:08 -08:00
Joe Fernandez
aac29f126e Merge "docs: NDK r8c Release Notes" into jb-dev-docs 2012-11-12 14:28:05 -08:00
Joe Fernandez
cee5dab675 Merge "docs: JOBB tool help page" into jb-dev-docs 2012-11-12 14:25:55 -08:00
Quddus Chong
94b3f8eee6 docs: Added new docs for uiautomator testing framework. 
Change-Id: I9fea9e7a711a37bb1f2492b4aa3938e147614125
 2012-11-12 14:23:13 -08:00
Scott Main
b9a2a0402a Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev 2012-11-12 12:19:21 -08:00
Geremy Condra
e83f30726a am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev 
* commit '8b73fc1ad3c0698de1ee2a9a8672e55a66ac6f9e':
  DO NOT MERGE Control access to tts objects
 2012-11-12 12:08:04 -08:00
Scott Main
b50e7e0f8a am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit '65b59f5035686f63ebc7d4f8ccc1172b30618ee6':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-12 12:07:47 -08:00
Scott Main
67ba5d189c docs: 7 tap instructions for dev options 
Change-Id: I42867cdf962c0c4231d6037737226381220c6ecf
 2012-11-12 11:24:01 -08:00
Katie McCormick
c5b47cff88 resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
 2012-11-12 10:07:09 -08:00
David Agnew
4c0fc03b5e When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 14:35:02 -05:00
Scott Main
85abb087b9 Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 2012-11-09 20:59:18 -08:00
Scott Main
002618b2e9 docs: update Tools landing page with info for developer options 
Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
 2012-11-09 20:50:52 -08:00
Baligh Uddin
ba52aff41b Import translations. DO NOT MERGE 
Change-Id: I293bcd411943a50960328eb2ef836f4b9ba2295e
Auto-generated-cl: translation import
 2012-11-09 09:56:53 -08:00
Adam Cohen
f69320a1f0 Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 2012-11-08 16:36:56 -08:00
Adam Cohen
3e9cba4f9d Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 2012-11-08 16:35:42 -08:00
Adam Cohen
c276e82dd0 Deferring size callbacks until boot completed (issue 7469267) 
-> Also bumping priority of the boot completed receiver

Change-Id: I7b68a29b4a8c927713bfbc1f4585f96ce0c47f35
 2012-11-08 14:56:36 -08:00
Geremy Condra
8b73fc1ad3 am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev 
* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects
 2012-11-08 14:26:39 -08:00
Geremy Condra
2b4bc305a2 Merge "DO NOT MERGE Control access to tts objects" into jb-dev 2012-11-08 14:22:48 -08:00
Winson Chung
40f8211e68 Preventing more than five widgets from being added in the carousel (issue 7502935) 
Change-Id: I26e6e154992e56b128d541578ffd3891776a3f7a
 2012-11-08 13:24:04 -08:00
Dianne Hackborn
a46a74fcd6 Merge "Remove extraneous logs." into jb-mr1-dev 2012-11-08 13:16:10 -08:00
Dianne Hackborn
7ff30113de Remove extraneous logs. 
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
 2012-11-08 13:13:48 -08:00
Daniel Sandler
9de5901bb3 Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev 2012-11-08 09:48:46 -08:00
Daniel Sandler
b499b1fa08 Don't crash if no ECA. 
(Phone landscape pattern lock, for example.)

Bug: 7502613
Change-Id: I3f48c4351ea04db2d8ad9a410166f60257f3d954
 2012-11-08 12:42:54 -05:00
Chris Wren
7d59cf9f10 Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 2012-11-08 09:40:21 -08:00
Chris Wren
e1a8eee6d0 allow pattern linear layout to manage message_area. 
Bug: 7501923
Change-Id: I5126e760d8567380e2041ca01791f14c7b054adb
 2012-11-08 12:28:15 -05:00
Daniel Sandler
4eada64770 Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 2012-11-08 09:28:14 -08:00
Daniel Sandler
6ed3fcafdb Only show the bouncer for the assistant if secure. 
We do this by using the helpful tools in
KeyguardActivityLauncher which do all the right callbacks
and stuff.

(This assumes the assist gesture is sufficiently hard to
false that we don't need the extra step of bouncing the
glowpad unlock affordance.)

Bug: 7500637
Change-Id: Id68cb85cdfd741f43a5bce69118ec4209125d785
 2012-11-08 12:13:17 -05:00
John Spurlock
14adfe425e Address comments from merged "Fix remaining jank in sec..." 
Cleanup based on post-merge comments on:
  I554ddffb7981488fa8a81933842b0c7730e775f3

Bug:7482560
Change-Id: I06b2bc91da9dfddd06db69efb9e7ad45c304f709
 2012-11-08 10:29:26 -05:00
John Spurlock
7a73344bbe Minimal fix for stuck google now. 
Bug:7500409
Change-Id: I1570d72e08fbe520ac07eed2ee40b6571fa1fe3c
 2012-11-08 09:08:14 -05:00
Jim Miller
899e6c7383 Merge "Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev 2012-11-08 02:31:08 -08:00
Michael Jurka
eb963f046d Enforce max number of 5 lockscreen widgets 
Change-Id: I7b7fca18174736c8f1aa0018f7399982c80b1cb0
 2012-11-08 02:06:38 -08:00
Jim Miller
bac6d4bf3c Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone. 
Fixes bug 7499778

Change-Id: I450755b8839717f0f13241cb57f0015cf78569d9
 2012-11-08 01:27:09 -08:00
Adam Cohen
c8ed8d3260 Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 2012-11-08 01:03:50 -08:00
Jim Miller
e1a473b0d4 Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 2012-11-08 01:00:12 -08:00
Jim Miller
9e0a250600 Don't show ECA in landscape mode on phones. 
Fixes bug 7490941

Change-Id: I8a65aed0b4efc8676b95ad5fea6a7f4ac7d944d0
 2012-11-08 00:57:31 -08:00
Jim Miller
6be441c532 Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 2012-11-08 00:51:26 -08:00
Adam Cohen
08c83ef488 Adding user activity when the challenge is slid down 
Change-Id: I54a7dcf79718090dac6ec5991185712cc2abca37
 2012-11-08 00:45:49 -08:00
Jim Miller
4eeb4f664a Add mechanism to kick keyguard to show the assistant 
Fixes bug 7499778

Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
 2012-11-08 00:39:04 -08:00
Adam Powell
5dd8b00891 Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 2012-11-08 00:28:58 -08:00