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

36599 Commits

Author SHA1 Message Date
Scott Main
01798b0553 am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '76d857639efa3e5fd01553a26b6742a6895d189f':
  docs: clarify startActivity
 2013-03-05 13:09:44 -08:00
Scott Main
0f1259ccb7 am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs 
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
 2013-03-05 13:03:25 -08:00
Jeff Sharkey
2048fbb110 am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
  Tighten enforcement of file modes.
 2013-03-01 17:30:45 -08:00
Jeff Sharkey
1e5e3748d4 am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
  Tighten enforcement of file modes.
 2013-03-01 17:26:07 -08:00
Jeff Sharkey
67f2957331 am bb2aa63b: am a2e929e1: Tighten enforcement of file modes. 
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
  Tighten enforcement of file modes.
 2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4 am a2e929e1: Tighten enforcement of file modes. 
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
  Tighten enforcement of file modes.
 2013-03-01 17:20:51 -08:00
Jeff Sharkey
a2e929e1df Tighten enforcement of file modes. 
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
 2013-03-01 16:17:09 -08:00
Scott Main
87bff974d0 docs: clarify startActivity 
Change-Id: I821321441bbb39b84031e9c65fe43762270e0148
 2013-02-27 15:46:34 -08:00
Katie McCormick
2306f0ee33 am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit 'ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:23:00 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:18:48 -08:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653 
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
 2013-02-07 16:42:26 -08:00
Dake Gu
96111ddff7 Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev 2013-02-06 22:57:26 +00:00
Adam Powell
a7e028a976 am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse 
# Via Adam Powell (1) and Android Git Automerger (1)
* commit 'cef582ab0346afdaff9190565d432a9468ecdd7d':
  Fix re-enabled state of up after action view collapse
 2013-02-05 16:53:04 -08:00
Adam Powell
07cf971e58 Fix re-enabled state of up after action view collapse 
A certain call ordering to the action bar could cause the record of
the pre-action view expanded home button enabled state to be
incorrect. Store this in all cases, not just when the action view is
initially expanded. (Except for when we actually disable it for the
expanded view.)

If an action view is already expanded when we get a call to change the
enabled state of the home/up button, don't modify the state of the up
container or other accessibility info, but record the new state if
requested.

Bug 8142097

Change-Id: I070c151aa9f2046d2114ee541d964bf68c6f0def
 2013-02-05 16:24:25 -08:00
Adam Powell
6a33c4031d am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '569f138ef1a94e6d6cfc0587f06b396a77f00c1c':
  Fix regression in expanded action view up
 2013-02-04 13:53:24 -08:00
Adam Powell
62f33030b9 Fix regression in expanded action view up 
A bug was introduced when these views were restructured. Make sure that the
Up button for expanded action views functions/focuses correctly.

Bug 8124825

Change-Id: I0a886e62fca21dbb9a173db87642bb79ce9245e7
 2013-02-04 12:47:34 -08:00
Dake Gu
9f811fd447 SimulatdDpad: fix NPE for event without device 
Fix a rare case that We lost device(due to network issue)
and SimulatedDpad received the MotionEvent without device.

b/8121964

Change-Id: Ie2948e6ff14a84422b05dda8ea87a3571f26f252
 2013-02-01 16:31:42 -08:00
Xia Wang
599f9611aa am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev 
# Via Android (Google) Code Review (1) and others
* commit 'f3ef10b12b61891962eb6253e95c8c9eec82d383':
  Fix WiFi test:
 2013-01-30 18:59:22 -08:00
Xia Wang
2297d1e78c Merge "Fix WiFi test:" into jb-mr1.1-dev 2013-01-31 02:54:56 +00:00
Xia Wang
f2991add02 Fix WiFi test: 
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
    Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
    to avoid that, change the test to connect without scanning.

 -- Increase the timer to wait for WiFi to be connected

Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
 2013-01-30 18:52:27 -08:00
Fabrice Di Meglio
a62dbfd953 Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE 
Change-Id: I19b7a53c1c7d805fb9b1611e8944db27c82fc986
 2013-01-30 12:30:03 -08:00
Doug Zongker
b616f0c239 add android.permission.LOOP_RADIO for access to loop radio device 
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
 2013-01-29 10:39:13 -08:00
Adam Powell
53d49f1702 am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '17f05497be90004c0263c6de173af8c19ece07b0':
  Touch action bar title text: you will go to space today!
 2013-01-23 15:46:20 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
ce2f911d87 am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 
# Via Adam Powell (1) and others
* commit '650830491868b961e98c1837fb4b4ce7917783b5':
  Prevent simultaneous interaction with action bar and content
 2013-01-23 15:25:50 -08:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today! 
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
 2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content 
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
 2013-01-23 14:23:06 -08:00
Dake Gu
f8739b992f Fix bug of SimulatedTrackball 
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true

b/8022205

Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
 2013-01-17 18:15:44 -08:00
Jeff Brown
9afb2e1a95 Optimize focused input event dispatch in view root. DO NOT MERGE 
The efficiency of key, trackball and generic motion event
dispatch is greatly influenced by the IME dispatch cycle.
This change simplifies the dispatch of focused input events
and avoids causing event processing to be requeued on the
handler and delayed unnecessarily.

Bug: 7984576
Change-Id: Id82624a3f32c05efe6ee5c322bd55bf2ab21525d
 2013-01-14 15:55:35 -08:00
Scott Kennedy
5d6d6aab25 am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '8e45679adfe03271dd1cc627d6c4542649a0446a':
  docs: Fix a bunch of issues
 2013-01-14 11:13:25 -08:00
Scott Kennedy
026f91915f am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
  docs: Fix a bunch of issues
 2013-01-14 11:09:27 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues 
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
 2013-01-11 23:44:11 -08:00
Dianne Hackborn
854458f4d5 am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog 
* commit '0287ca3ca36ad98004ddabfa189105e6324a820e':
  Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog
 2013-01-09 19:00:06 -08:00
Dianne Hackborn
e62fa82579 Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog 
The volume panel now forces us out of the UI modes while it
is up.

Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
 2013-01-09 18:51:51 -08:00
Adam Powell
d17792073f am 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev 
* commit '0bf63a9a76ba513b5f6c603857bcd4d3e4506566':
  Make action bar title a valid touch target for up when relevant
 2013-01-09 11:26:07 -08:00
Adam Powell
d29f2d263a Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev 2013-01-09 11:19:22 -08:00
Scott Main
782b0f7141 am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs 
* commit '4459827f7db379031e658b2153aac1f7c882adc6':
  docs: a few doc bugs
 2013-01-08 20:18:35 -08:00
Scott Main
25505f959c am cdf5106a: docs: a few doc bugs 
* commit 'cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
  docs: a few doc bugs
 2013-01-08 20:13:40 -08:00
Scott Main
cdf5106aaf docs: a few doc bugs 
Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d
 2013-01-08 20:07:31 -08:00
Adam Powell
4dca8636f8 Make action bar title a valid touch target for up when relevant 
arubin bug 7966136

Change-Id: Iea5b85852cc1664f1390a6f8b6179d63b50857e4
 2013-01-08 19:26:21 -08:00
Scott Main
5b56d43237 am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '9107fa5d7ca1b928e10ffc9395b2f2eb38db7a14':
  docs: resolve bugs from external tracker
 2013-01-08 12:45:36 -08:00
Scott Main
66adf0d04d am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '70af3cdb90bafc081ffa693a350b95ced48b6cfd':
  docs: resolve bugs from external tracker
 2013-01-08 12:42:10 -08:00
Scott Main
6aad995042 docs: resolve bugs from external tracker 
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
 2013-01-08 12:02:38 -08:00
Dake Gu
1ee60179bb fix ImageView.getImageMatrix() 
getImageMatrix() does not return "mDrawMatrix",  instead it returns
mMatrix.  This is not reflecting the matrix used in drawing when
Bitmap is changed and mDrawMatrix is set to null while mMatrix still
holds old invalid data.

Change-Id: If24c3118068eca70cfe15786f9715d95c4499f3b
 2013-01-03 15:11:43 -08:00
Justin Koh
8690369969 Merge "Start RecognitionActivity with an upswipe gesture." into jb-mr1-aah-dev 2012-12-19 11:42:26 -08:00
Ben Pietrzak
05cb363bf3 Start RecognitionActivity with an upswipe gesture. 
Change-Id: I7dd91bef3eb551bb7617307cc9a4777226b5ded7
 2012-12-18 11:12:47 -08:00
Robert Ly
d4f4d14a91 am 5042b051: am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev 
* commit '5042b051b395f36d3c582202e9e78758934b79a6':
  change onEnd() to withEndAction() in javadocs
 2012-12-17 15:37:21 -08:00
Robert Ly
5042b051b3 am e7c3fba7: Merge "change onEnd() to withEndAction() in javadocs" into jb-mr1-dev 
* commit 'e7c3fba7929a1cb73bbe6ca84a5140febc09a62a':
  change onEnd() to withEndAction() in javadocs
 2012-12-17 15:35:26 -08:00
Robert Ly
8ee2a70f08 change onEnd() to withEndAction() in javadocs 
Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
 2012-12-17 15:00:08 -08:00
Sascha Prueter
25458528f0 am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit 'dd2ed93e4794dd8472593cdd21fb7e0056f11dbf':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:46:04 -08:00