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

174080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
29fabd8988 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
  Fix a few typos in Parcel.java.
 2015-02-05 20:47:23 +00:00
John Spurlock
9adf1c5422 am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
  Fix a few typos in Parcel.java.
 2015-02-05 20:39:36 +00:00
Alan Viverette
2fb5a6ab9f Update preference dialog padding to Material 
Mostly copy/paste of the Holo with some padding fiddling to make the
EditText, which has baked-in padding, and TextView line up.

Bug: 19280124
Change-Id: I4a8ad7dcc1f1bd519f4d1c506984871a25a1db31
 2015-02-05 12:35:07 -08:00
Filip Gruszczynski
9fedc72a0b Add wallpaper controlling system apis. 
Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211
 2015-02-05 12:29:42 -08:00
John Spurlock
ac7b9dd39f am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
  Fix a few typos in Parcel.java.
 2015-02-05 20:27:59 +00:00
Ruben Brunk
2a114737c6 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
* commit 'cd0d7cdefef0dbf395e5b159dccb6e884a2077b7':
  camera2: Make legacy error handling more robust.
 2015-02-05 20:19:55 +00:00
John Spurlock
42d3b66f48 am e0852368: Fix a few typos in Parcel.java. 
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.
 2015-02-05 20:18:03 +00:00
Filip Gruszczynski
d05af86e6e Add hidden shutdown method to PowerManager. 
Bug: 17420540

We need to be able to shutdown some of wearable devices programatically.
We should be able to do it by connecting to PowerManagerService directly,
but it would be nice to go through the official interface.

Change-Id: Id0cf3b36c03447356fc60fb90cbb2f4b47d8265e
 2015-02-05 12:12:43 -08:00
Ruben Brunk
cd0d7cdefe Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 2015-02-05 19:54:37 +00:00
Kenny Guy
74a7024af0 Fix mangled javadoc for setPermittedInputMethods. 
Fix java doc for setPermittedInputMethods.

Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
 2015-02-05 19:48:38 +00:00
Sanket Padawe
1acdd4b1f4 Suppress phone number from logcat. 
Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
 2015-02-05 11:45:27 -08:00
Adam Lesinski
abc88d0743 am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 
* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
  Make ArrayMap.EMPTY immutable
 2015-02-05 19:39:27 +00:00
Dianne Hackborn
29039a2bdb am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
* commit '5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 19:39:23 +00:00
Jason Monk
6d72d46b4b am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
  Ellipsize QS detail items when needed
 2015-02-05 19:39:18 +00:00
Alan Viverette
f1a4d0e864 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()
 2015-02-05 19:39:14 +00:00
Adam Lesinski
967439b4d1 Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 2015-02-05 19:27:00 +00:00
Dianne Hackborn
5c2fdc331f Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 2015-02-05 19:26:32 +00:00
Jason Monk
3bbc5a1134 Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 2015-02-05 19:19:43 +00:00
Alan Viverette
f15f6a5087 Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 2015-02-05 19:16:58 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable 
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
 2015-02-05 11:11:03 -08:00
Kenny Guy
a2ced3e879 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
automerge: eeb43fb

* commit 'eeb43fbd61adfc6511528e2e13fd5372a14e2831':
  Only switch user if current user is being wiped
 2015-02-05 18:51:53 +00:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText() 
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
 2015-02-05 09:58:49 -08:00
Jason Monk
867874b06a Ellipsize QS detail items when needed 
Bug: 19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2
 2015-02-05 11:54:58 -05:00
Kenny Guy
eeb43fbd61 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped
 2015-02-05 15:26:09 +00:00
Kenny Guy
8d12d3da15 Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 2015-02-05 12:34:45 +00:00
Alan Viverette
eeb69d171b Move layer-list to be top-level element in seek bar progress automerge: bac8e12 
automerge: 6708ac4

* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:45:31 +00:00
Zhijun He
1350671f40 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:44:01 +00:00
Alan Viverette
6708ac40f2 Move layer-list to be top-level element in seek bar progress 
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:35:27 +00:00
Alan Viverette
c2bf7440ba Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
  Allow top-level drawable container in progressDrawable
 2015-02-05 02:39:32 +00:00
Alan Viverette
fcce8e1a82 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957 
automerge: f89e06f

* commit 'f89e06fa58c08ff550a69b268832a2ea338b8700':
  Replace ic_clear with vector icon
 2015-02-05 02:38:25 +00:00
Yang Ni
b457258b5a am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit 'da91dfbdf20271dffce5357195800cf36183ad97':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:31:46 +00:00
Lorenzo Colitti
b43e74bbce am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:31:40 +00:00
Yang Ni
da91dfbdf2 am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit '1269ff961000c726247d510762e42b21562b8c2b':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:24:35 +00:00
Lorenzo Colitti
12b26c1248 am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '21702263d96341bc13420e2c74af9a4bec6c7907':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:24:31 +00:00
Zhijun He
6bafb86655 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 02:15:49 +00:00
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust. 
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
 2015-02-04 17:26:17 -08:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress 
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
 2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 01:13:06 +00:00
Alan Viverette
f89e06fa58 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
automerge: 721a957

* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 01:11:28 +00:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Yang Ni
1269ff9610 Merge "Adds invocable functions to ScriptGroup" 2015-02-05 01:05:08 +00:00
Alan Viverette
80252a92e5 Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3 Allow top-level drawable container in progressDrawable 
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
 2015-02-04 16:44:02 -08:00
George Mount
8e7c154b07 Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c 
automerge: 23eef1e

* commit '23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:32:01 +00:00
Miao Wang
4bd2c00d8d Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc 
automerge: 58fd96c

* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 00:27:49 +00:00
Yang Ni
be392ad35e Adds invocable functions to ScriptGroup 
This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
 2015-02-04 16:24:48 -08:00
Lorenzo Colitti
21702263d9 Merge "Add a unit test for StaticIpConfiguration." 2015-02-05 00:21:57 +00:00
Alan Viverette
721a95784e Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 2015-02-05 00:20:15 +00:00
George Mount
23eef1ec5e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
automerge: c3a043c

* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:15:50 +00:00
Miao Wang
58fd96c607 Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" 
automerge: 9a55cbc

* commit '9a55cbc0523bb05f15a1ea252c6736ce5060c53e':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 00:07:17 +00:00