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

207951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
54a0cf1b95 Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal" 
This reverts commit 33852d8cd21434b4106b8f2c504752ef34abb2da.

Change-Id: I29a212876c93ae0288967ffcff223abafad78827
 2015-07-17 20:34:18 +00:00
Svet Ganov
fa9a616de9 am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit '4a1421f3c50d53a7e2230f41854df12215378ef2':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 20:32:28 +00:00
ztenghui
8b455841d9 am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 
* commit '094c82ada3799045588790252a64806b9930f8c2':
  Scaling (Animated)VectorDrawable inside ImageView
 2015-07-17 20:32:24 +00:00
Svet Ganov
4a1421f3c5 Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 2015-07-17 20:27:36 +00:00
Svet Ganov
33852d8cd2 Do not auto grant GET_ACCOUNTS as it is temporarily normal 
bug:22550851

Change-Id: Iea5dd8fde07074220167a937b32208b1c9488d9d
 2015-07-17 13:21:36 -07:00
ztenghui
094c82ada3 Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 2015-07-17 20:21:28 +00:00
Julia Reynolds
b76ed66d43 am 35d586c1: am a76265a4: am 46a088e4: am e0746d32: am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev 
* commit '35d586c172a91fa7c64be36f696dff74e5555a3e':
  Remove focusablilty of the status bar.
 2015-07-17 19:58:26 +00:00
Wale Ogunwale
6f1ea26144 am 17b4f6f2: am c240e748: am 6b098bfe: am 25257ca5: am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit '17b4f6f2dbfad329c298b4d26269d38728f777eb':
  Fixed bad merge conflict resolution
 2015-07-17 19:58:20 +00:00
Mady Mellor
554a3eaeea am 5c58890c: am faeaa0ce: am b44cc17d: am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 
* commit '5c58890cea4449c9460f15984d37e6d0ff0adfc4':
  Update stylus gesture to access quick settings to use the new buttons
 2015-07-17 19:52:51 +00:00
Tingting Wang
08c714b962 am 435d6efc: am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit '435d6efc45af19759d5642d91e9532604888e767':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 19:52:45 +00:00
Julia Reynolds
35d586c172 am a76265a4: am 46a088e4: am e0746d32: am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev 
* commit 'a76265a439b8a0ff882143009726ce530beb271d':
  Remove focusablilty of the status bar.
 2015-07-17 19:44:23 +00:00
Wale Ogunwale
17b4f6f2db am c240e748: am 6b098bfe: am 25257ca5: am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit 'c240e7485994e7736a7011dabb41c32266d867bd':
  Fixed bad merge conflict resolution
 2015-07-17 19:44:16 +00:00
Julia Reynolds
a76265a439 am 46a088e4: am e0746d32: am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev 
* commit '46a088e4383b97147e04ede61d832c9d2700fea0':
  Remove focusablilty of the status bar.
 2015-07-17 19:31:21 +00:00
Wale Ogunwale
c240e74859 am 6b098bfe: am 25257ca5: am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit '6b098bfee8c6adbf991cce35083aeaa11a5e8137':
  Fixed bad merge conflict resolution
 2015-07-17 19:31:15 +00:00
Adrian Roos
30a7dfa329 Fix image wallpaper size 
Fixes a bug where the image wallpaper size
would not correctly update. Suspected cause
is checking the to-be-requested size against
the current surface size instead of the
requested surface size.

Also removes an unused field.

Bug: 21148936
Change-Id: Ief4585bd5aed5922337709d7ae0ca0bf948649d0
 2015-07-17 12:30:37 -07:00
Mady Mellor
5c58890cea am faeaa0ce: am b44cc17d: am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 
* commit 'faeaa0ce5243d2a4c286b6da7f9e500df8062f80':
  Update stylus gesture to access quick settings to use the new buttons
 2015-07-17 19:23:28 +00:00
Tingting Wang
435d6efc45 am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit 'cee004330e0e7f928437a7b17e6263a1b12bfa8f':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 19:23:23 +00:00
Julia Reynolds
46a088e438 am e0746d32: am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev 
* commit 'e0746d32306ff20d864b465ff1d6cd249daedb9d':
  Remove focusablilty of the status bar.
 2015-07-17 19:11:10 +00:00
Wale Ogunwale
6b098bfee8 am 25257ca5: am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit '25257ca52e57b982ba71be040a7f261c66d37236':
  Fixed bad merge conflict resolution
 2015-07-17 19:11:06 +00:00
Mady Mellor
faeaa0ce52 am b44cc17d: am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 
* commit 'b44cc17d6fc820859ab56fd6f9d64426878dfbad':
  Update stylus gesture to access quick settings to use the new buttons
 2015-07-17 19:00:49 +00:00
Tingting Wang
cee004330e am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit 'b1322a2a11b3475f2f657674d83b98884c308c09':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 19:00:43 +00:00
Mady Mellor
b44cc17d6f am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 
* commit '9629f637b79d85f27efa224b208d8b3cfd2591a4':
  Update stylus gesture to access quick settings to use the new buttons
 2015-07-17 18:57:54 +00:00
Julia Reynolds
e0746d3230 am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev 
* commit '3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d':
  Remove focusablilty of the status bar.
 2015-07-17 18:54:20 +00:00
Wale Ogunwale
25257ca52e am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit 'af81434023d19cfd486c84c210f2b6540a2bab35':
  Fixed bad merge conflict resolution
 2015-07-17 18:54:16 +00:00
Julia Reynolds
3368e69e9d Merge "Remove focusablilty of the status bar." into mnc-dev 2015-07-17 18:49:22 +00:00
Svetoslav Ganov
0269352160 am 6b2d1be6: am f4d5fa93: am 55596f85: am 098a88e6: am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev 
* commit '6b2d1be6628fa80a4e2c9f8c893606dc1030cf7f':
  Revert "Temporary lower GET_ACCOUNTS protection level"
 2015-07-17 18:45:50 +00:00
Svet Ganov
4f4734ff0e am 62237c4e: am 60584816: am e329ce0c: am 7a8f2006: am ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev 
* commit '62237c4ea09ab52db7176c838ca713ae3d87e933':
  Temporary lower GET_ACCOUNTS protection level
 2015-07-17 18:45:42 +00:00
Tingting Wang
b1322a2a11 am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit '6aee4761a826c3ef2793dc5c62d2451bd7450c61':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 18:45:41 +00:00
Wale Ogunwale
af81434023 Merge "Fixed bad merge conflict resolution" into mnc-dev 2015-07-17 18:44:58 +00:00
Mady Mellor
9629f637b7 am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 
* commit '9c98b859fd6aee74f23b66fccbd3bf2436efcdb9':
  Update stylus gesture to access quick settings to use the new buttons
 2015-07-17 18:44:51 +00:00
Tingting Wang
6aee4761a8 am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 18:30:56 +00:00
Mady Mellor
9c98b859fd Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 2015-07-17 18:30:53 +00:00
Svetoslav Ganov
6b2d1be662 am f4d5fa93: am 55596f85: am 098a88e6: am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev 
* commit 'f4d5fa93bb9287a3748304436b4e57e8e8132713':
  Revert "Temporary lower GET_ACCOUNTS protection level"
 2015-07-17 18:30:31 +00:00
Svet Ganov
62237c4ea0 am 60584816: am e329ce0c: am 7a8f2006: am ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev 
* commit '60584816e32982ce732aacee64c0179fa1c166f5':
  Temporary lower GET_ACCOUNTS protection level
 2015-07-17 18:30:27 +00:00
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed 
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
 2015-07-17 11:21:26 -07:00
Tingting Wang
ad359f2e70 Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 2015-07-17 18:19:56 +00:00
ztenghui
35289f12d6 Scaling (Animated)VectorDrawable inside ImageView 
Before, the VectorDrawable is behaving like BitmapDrawable inside a ImageView,
and it can be blurry due to scaling.
Now apply the scaling information to the cached bitmap, then the size of bitmap
will match the ImageView's screen size. Therefore, no blurry any more.

b/18185626

Change-Id: I979cef3b5178a9bd37ee6cc776df3361ca47c803
 2015-07-17 11:16:41 -07:00
Svetoslav Ganov
f4d5fa93bb am 55596f85: am 098a88e6: am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev 
* commit '55596f859acd376a3a0697f7a1f1c48330957246':
  Revert "Temporary lower GET_ACCOUNTS protection level"
 2015-07-17 18:16:07 +00:00
Svet Ganov
60584816e3 am e329ce0c: am 7a8f2006: am ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev 
* commit 'e329ce0cb4bc0be517a84520891e009531e6e78d':
  Temporary lower GET_ACCOUNTS protection level
 2015-07-17 18:16:00 +00:00
Chien-Yu Chen
dbe315ef87 am a66ff773: am 39b3013d: am fe13f57f: am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit 'a66ff7736ff2269be1f8d490c7dd1417731e2f32':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 18:05:19 +00:00
Eino-Ville Talvala
f5d0c3bf9d am 5c24b98c: am 02d3199d: am 5e20e0c9: am 69508f49: am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '5c24b98ca213ca07a55a3a74e3104e635ed7c3ee':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 18:05:13 +00:00
Svetoslav Ganov
55596f859a am 098a88e6: am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev 
* commit '098a88e6a330c123c3daeda334e91c8656ecb4b2':
  Revert "Temporary lower GET_ACCOUNTS protection level"
 2015-07-17 18:01:58 +00:00
Svet Ganov
e329ce0cb4 am 7a8f2006: am ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev 
* commit '7a8f20065a777b130a1aa46dc2152e34190f1947':
  Temporary lower GET_ACCOUNTS protection level
 2015-07-17 18:01:54 +00:00
Svetoslav Ganov
098a88e6a3 am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev 
* commit '2a500e32169b53679db83077e57f3c9cd02cfd36':
  Revert "Temporary lower GET_ACCOUNTS protection level"
 2015-07-17 17:47:54 +00:00
Svet Ganov
7a8f20065a am ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev 
* commit 'ecb887925a3ff3d54ecb6593932d4f866a6fe9e9':
  Temporary lower GET_ACCOUNTS protection level
 2015-07-17 17:47:49 +00:00
Chien-Yu Chen
a66ff7736f am 39b3013d: am fe13f57f: am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit '39b3013dfed727ed9273b377d5998a442d931fac':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:47:48 +00:00
Eino-Ville Talvala
5c24b98ca2 am 02d3199d: am 5e20e0c9: am 69508f49: am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '02d3199dbe9d1d59e2ef288e5e170248e1d52bd4':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:47:42 +00:00
Nancy Chen
f66841529f am 7688014d: am a48413e2: am f9b4961d: am ce9fea39: am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit '7688014d4f3de8235c0fc971a6a7bf020b1d3674':
  Add transcription field to voicemail object and related changes.
 2015-07-17 17:47:38 +00:00
Svetoslav Ganov
2a500e3216 Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev 2015-07-17 17:36:57 +00:00
Svetoslav Ganov
2c20277dd5 Revert "Temporary lower GET_ACCOUNTS protection level" 
This reverts commit 6e20ac343c22ab27e5ac7471bc1219df6bf11282.

Change-Id: I96b21bad9406abffa95c90abde509dc8dcf3eff5
 2015-07-17 17:35:05 +00:00