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

88406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
be22a935e4 am 0c3d9df9: am b0d135d9: Merge "Add stroke support to polygonal shape rendering" into jb-mr1-dev 
* commit '0c3d9df9197d03ec28db8871b81df39c61c8c4c3':
  Add stroke support to polygonal shape rendering
 2012-09-27 16:12:45 -07:00
Baligh Uddin
dd9e496aae am 064649ef: (-s ours) am d9730390: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '064649ef3b7f2d187b233069d1580ff81b9b29e6':
  Import translations. DO NOT MERGE
 2012-09-27 16:12:19 -07:00
Daniel Sandler
422ca45298 am f7c1299a: am 4735a1e1: Merge "New notification/settings panel handle assets." into jb-mr1-dev 
* commit 'f7c1299ab3f0024750426ccdd1207b29a7e27cf4':
  New notification/settings panel handle assets.
 2012-09-27 16:12:15 -07:00
Philip Milne
f7da569774 Merge "Optical bounds support for LinearLayout, TableLayout and TableRow." 2012-09-27 15:08:11 -07:00
Philip Milne
ad365cc217 Optical bounds support for LinearLayout, TableLayout and TableRow. 
The generic support for optical bounds provided in:

https://googleplex-android-review.googlesource.com/#/c/228269/

did not work correctly for nested LinearLayouts. With this fix
all the layouts in the APIdemos now seem to layout correctly
when the optical bounds mode is enabled.

(There's currently no, user level, way to do this. Instead, the
optical bounds layout mode has to be enabled on a per view basis.)

Change-Id: Id3d1d84445a8a2df277ddfe679c42f2d6cf775f4
 2012-09-27 14:46:36 -07:00
Baligh Uddin
e7fc0771ab Merge "Import translations. DO NOT MERGE" 2012-09-27 10:09:29 -07:00
Chris Craik
0c3d9df919 am b0d135d9: Merge "Add stroke support to polygonal shape rendering" into jb-mr1-dev 
* commit 'b0d135d91f3a41af09fd0281211f18e8452e7fc6':
  Add stroke support to polygonal shape rendering
 2012-09-27 09:50:18 -07:00
Chris Craik
b0d135d91f Merge "Add stroke support to polygonal shape rendering" into jb-mr1-dev 2012-09-27 09:47:52 -07:00
Baligh Uddin
064649ef3b am d9730390: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd9730390c6bbac09107866462b9bf45d0b5706cf':
  Import translations. DO NOT MERGE
 2012-09-27 08:38:34 -07:00
Baligh Uddin
d9730390c6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-27 08:36:33 -07:00
Baligh Uddin
7c9707f4fb Merge "Import translations. DO NOT MERGE" 2012-09-27 08:34:37 -07:00
Daniel Sandler
f7c1299ab3 am 4735a1e1: Merge "New notification/settings panel handle assets." into jb-mr1-dev 
* commit '4735a1e12cf240e12141b2a81475a52ffb0f7513':
  New notification/settings panel handle assets.
 2012-09-27 08:25:31 -07:00
Daniel Sandler
4735a1e12c Merge "New notification/settings panel handle assets." into jb-mr1-dev 2012-09-27 08:23:28 -07:00
Baligh Uddin
99f92af5f0 Merge "Import translations. DO NOT MERGE" 2012-09-27 07:49:35 -07:00
Daniel Sandler
4e32ba7ce7 New notification/settings panel handle assets. 
Bug: 7171620
Change-Id: Ie6bc31345eafe91c03ca2bd09399419e54831f33
 2012-09-27 10:34:41 -04:00
Satoshi Kataoka
75d768f678 am 29888113: am 2da2ec19: Merge "Fix imf flag" into jb-mr1-dev 
* commit '2988811323e19348f6839c7432f455cae6c8ff64':
  Fix imf flag
 2012-09-27 04:10:39 -07:00
Satoshi Kataoka
2988811323 am 2da2ec19: Merge "Fix imf flag" into jb-mr1-dev 
* commit '2da2ec19e0e5d5b50575eb7ebe4e2e7f170647dc':
  Fix imf flag
 2012-09-27 04:09:11 -07:00
Satoshi Kataoka
2da2ec19e0 Merge "Fix imf flag" into jb-mr1-dev 2012-09-27 04:06:14 -07:00
Satoshi Kataoka
accd22aa63 Fix imf flag 
Change-Id: I28a3155f329a3bd8b8a8f5d06b5ab21eba7d4558
 2012-09-27 20:04:38 +09:00
Dianne Hackborn
3274664264 am c3afe696: am 66442c7e: Merge "Work on issue #7232641: ISE crash when rotating phone in label list mode" into jb-mr1-dev 
* commit 'c3afe696371e57adfeeec152ef00e1d970b6ab13':
  Work on issue #7232641: ISE crash when rotating phone in label list mode
 2012-09-27 00:58:55 -07:00
Dianne Hackborn
7e31a58e55 am ce56b399: am 2480bc12: Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev 
* commit 'ce56b399e1e71f97ec9830ad0973f44555c0fd4f':
  Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user
 2012-09-27 00:57:09 -07:00
Dianne Hackborn
c3afe69637 am 66442c7e: Merge "Work on issue #7232641: ISE crash when rotating phone in label list mode" into jb-mr1-dev 
* commit '66442c7e7b86d0fb45e02b32b8750ed06b93ef06':
  Work on issue #7232641: ISE crash when rotating phone in label list mode
 2012-09-27 00:57:05 -07:00
Dianne Hackborn
ce56b399e1 am 2480bc12: Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev 
* commit '2480bc12a525a55ebff453dbf6ca95258b9f23cf':
  Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user
 2012-09-27 00:55:20 -07:00
Dianne Hackborn
66442c7e7b Merge "Work on issue #7232641: ISE crash when rotating phone in label list mode" into jb-mr1-dev 2012-09-27 00:54:55 -07:00
Dianne Hackborn
2480bc12a5 Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev 2012-09-27 00:53:08 -07:00
Dianne Hackborn
f43a33c5ea Work on issue #7232641: ISE crash when rotating phone in label list mode 
This doesn't fix the problem; I think it is an app problem.  It does
improve a bunch of the debugging to help better identify what is going
on, and introduces some checks when adding a fragment to fail
immediately if we are getting into a state when a fragment is going to
be in the added list multiple times (which is pretty much guaranteed
to lead to a failure at some point in the future).

Change-Id: If3a8700763facd61c4505c6ff872ae66875afc8d
 2012-09-27 00:51:56 -07:00
Dianne Hackborn
c7ba771a45 Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user 
Also tweak bind flags for new location services so they
aren't put so aggressively up in the oom adj list.

Change-Id: I9da25a3fea7681013b4d95b7db7e9a808f2d733b
 2012-09-26 23:22:59 -07:00
Jeff Brown
75d4ab1c88 am c8ce6750: am 7bb89cf1: Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev 
* commit 'c8ce675003aa2326965fee1eb3b33ea7dec79a8e':
  Cure narcolepsy.
  Allow applications to connect to known wifi displays.
 2012-09-26 20:25:33 -07:00
Jeff Sharkey
1028bcdfa2 am 73f7617a: am f21b94a8: Merge "Remove unused Secure settings." into jb-mr1-dev 
* commit '73f7617ac68042af0203dfb0aa070be62dca2c97':
  Remove unused Secure settings.
 2012-09-26 20:23:13 -07:00
Jeff Sharkey
4cabbc5be7 am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev 
* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
  First step towards cleaning up Global settings.
 2012-09-26 20:23:07 -07:00
Jeff Brown
c8ce675003 am 7bb89cf1: Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev 
* commit '7bb89cf1632da6dc236e6603c4245301500eeb39':
  Cure narcolepsy.
  Allow applications to connect to known wifi displays.
 2012-09-26 20:22:38 -07:00
Jeff Sharkey
73f7617ac6 am f21b94a8: Merge "Remove unused Secure settings." into jb-mr1-dev 
* commit 'f21b94a8774f238daf90105a42bc6c140dd7dae2':
  Remove unused Secure settings.
 2012-09-26 20:20:52 -07:00
Jeff Brown
7bb89cf163 Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev 
* changes:
  Cure narcolepsy.
  Allow applications to connect to known wifi displays.
 2012-09-26 20:19:09 -07:00
Jeff Sharkey
f57fcddb61 am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev 
* commit '68b7a6d14b68b38324ffd275c7227805c7d99b2d':
  First step towards cleaning up Global settings.
 2012-09-26 20:19:02 -07:00
Jeff Sharkey
f21b94a877 Merge "Remove unused Secure settings." into jb-mr1-dev 2012-09-26 20:17:44 -07:00
Jeff Sharkey
68b7a6d14b Merge "First step towards cleaning up Global settings." into jb-mr1-dev 2012-09-26 20:15:45 -07:00
Stephen Hines
40bfa8dd57 am 4b988f36: am 0b171158: Merge "RS char bug repro case" into jb-mr1-dev 
* commit '4b988f36b2fda6c4348c5eebb5664578b59eba6a':
  RS char bug repro case
 2012-09-26 19:08:21 -07:00
Stephen Hines
4b988f36b2 am 0b171158: Merge "RS char bug repro case" into jb-mr1-dev 
* commit '0b1711582ff07d6d1e8e4de6c057eaf6a3473ac3':
  RS char bug repro case
 2012-09-26 19:06:44 -07:00
Stephen Hines
38a29cce6a am 434913fe: am c49c71a5: Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev 
* commit '434913fe9ae1aae3947ded2c13d50026d27d3cae':
  Restore RSTest functionality (char bug is fixed).
 2012-09-26 19:06:43 -07:00
Stephen Hines
434913fe9a am c49c71a5: Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev 
* commit 'c49c71a5c600485c395d95fd02fabde082e30177':
  Restore RSTest functionality (char bug is fixed).
 2012-09-26 19:05:01 -07:00
Stephen Hines
0b1711582f Merge "RS char bug repro case" into jb-mr1-dev 2012-09-26 19:04:48 -07:00
Stephen Hines
c49c71a5c6 Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev 2012-09-26 19:03:21 -07:00
Jeff Brown
f9d40f4236 Cure narcolepsy. 
Bug: 7204211
Change-Id: I2c09abaad5d321cec6f62f7ca0ce00c3b61ee211
 2012-09-26 18:57:48 -07:00
Jeff Sharkey
de6a028a3e am 40642722: am dd78d462: Fix JNI method signature. 
* commit '406427225b43ea63940c7b32b5ff91eeffd6d64d':
  Fix JNI method signature.
 2012-09-26 18:53:15 -07:00
Jeff Sharkey
406427225b am dd78d462: Fix JNI method signature. 
* commit 'dd78d462f6dceac71f9d1cbb723bb38a3b5bdc2e':
  Fix JNI method signature.
 2012-09-26 18:51:43 -07:00
Jeff Sharkey
dd78d462f6 Fix JNI method signature. 
Change-Id: I156624e0ac55330f43d9c4d7f15d59f6c529aa0a
 2012-09-26 18:46:08 -07:00
Jeff Brown
bc33545746 Allow applications to connect to known wifi displays. 
Bug: 7177920
Change-Id: I9d8406e1016988e2cd267dfa52d78a829f1b385e
 2012-09-26 18:34:47 -07:00
Jeff Sharkey
4de9936e85 Remove unused Secure settings. 
Carefully leave default values intact in Watchdog for now.

Bug: 7232007, 7232230
Change-Id: Id944181109305aed41e0766fdd39625b43cb1d19
 2012-09-26 17:58:19 -07:00
Amith Yamasani
e65518fd1d am f2ecb683: am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev 
* commit 'f2ecb683529a9101c31b489e780a73b8744d19a3':
  Fix sync problems when setting up a new user and account
 2012-09-26 17:50:05 -07:00
Amith Yamasani
f2ecb68352 am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev 
* commit '38796fe16266e22c56d2eee3eb63fac0cb926aaa':
  Fix sync problems when setting up a new user and account
 2012-09-26 17:48:25 -07:00