OSDN Git Service
Billy Lau [Mon, 20 Jul 2015 18:43:56 +0000 (18:43 +0000)]
am
dd0602e8: am
072e04a7: Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '
dd0602e89daf6c458674efbcf01a5e0521f3c381':
Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
Jeff Sharkey [Mon, 20 Jul 2015 18:43:51 +0000 (18:43 +0000)]
am
0fa2a56c: am
71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev
* commit '
0fa2a56c3bc88cd4f3cddee99528c7e8a57af4d6':
Better logging of MediaPlayer failure reason.
Jean-Michel Trivi [Mon, 20 Jul 2015 18:43:47 +0000 (18:43 +0000)]
am
c1aaeead: am
698250fa: Merge "Media button intent should be send to current user only." into mnc-dev
* commit '
c1aaeead6ed7bb685c7bd0b5e09de935913229ed':
Media button intent should be send to current user only.
Billy Lau [Mon, 20 Jul 2015 18:04:08 +0000 (18:04 +0000)]
am
072e04a7: Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '
072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
Jeff Sharkey [Mon, 20 Jul 2015 18:04:04 +0000 (18:04 +0000)]
am
71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev
* commit '
71780e79846d0ccc2aef2214041657410a8a14c2':
Better logging of MediaPlayer failure reason.
Jean-Michel Trivi [Mon, 20 Jul 2015 18:04:01 +0000 (18:04 +0000)]
am
698250fa: Merge "Media button intent should be send to current user only." into mnc-dev
* commit '
698250fae7d82d8020d2b9038b9e9d68c9489b04':
Media button intent should be send to current user only.
Christopher Tate [Mon, 20 Jul 2015 18:03:55 +0000 (18:03 +0000)]
am
0fc1e88c: am
6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev
* commit '
0fc1e88c05e805324880a35b3f10126937824a79':
Don't fall back to domain verification state when looking up app linkage state
Billy Lau [Mon, 20 Jul 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Better logging of MediaPlayer failure reason." into mnc-dev
Billy Lau [Mon, 20 Jul 2015 16:34:09 +0000 (17:34 +0100)]
Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps
Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.
Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
Christopher Tate [Mon, 20 Jul 2015 17:27:56 +0000 (17:27 +0000)]
am
6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev
* commit '
6afdad7e8863cb1fa3db5909e48269606fa76991':
Don't fall back to domain verification state when looking up app linkage state
Jean-Michel Trivi [Mon, 20 Jul 2015 17:25:27 +0000 (17:25 +0000)]
Merge "Media button intent should be send to current user only." into mnc-dev
Christopher Tate [Mon, 20 Jul 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 16:38:02 +0000 (09:38 -0700)]
Better logging of MediaPlayer failure reason.
Otherwise exception details are dropped on the floor, making it
hard to debug.
Bug:
22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
Geoff Mendal [Mon, 20 Jul 2015 16:06:38 +0000 (16:06 +0000)]
am
34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
34c7ef5d59961e1d7fdc1b14c9e46ea11cf15859':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 15:58:50 +0000 (15:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 20 Jul 2015 15:47:33 +0000 (10:47 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ib98726d7c1b13a15d59e90a4e51b79542b0ff418
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Jul 2015 14:32:47 +0000 (14:32 +0000)]
am
5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5cc92074091ad5223380bf65e22ad054e9f2211f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 14:32:42 +0000 (14:32 +0000)]
am
c0fa470d: (-s ours) Import translations. DO NOT MERGE
* commit '
c0fa470da08460dc749e24107c904f47e3ee0d94':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 14:26:39 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 20 Jul 2015 13:54:33 +0000 (06:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63f59410a8081aaf9678e9d318ba308c259e1254
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Jul 2015 13:52:40 +0000 (06:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07
Auto-generated-cl: translation import
Erik Kline [Sat, 18 Jul 2015 17:41:11 +0000 (17:41 +0000)]
am
9d598e11: Pass signal strength thresholds inside a Bundle
* commit '
9d598e115f306e4f0860638c5647a959ac1320c5':
Pass signal strength thresholds inside a Bundle
Lorenzo Colitti [Sat, 18 Jul 2015 17:41:07 +0000 (17:41 +0000)]
am
c3f21f3b: Support NetworkCallbacks based on signal strength.
* commit '
c3f21f3b8b01508f5dc01b2e5fa4c3d652bb67bb':
Support NetworkCallbacks based on signal strength.
Erik Kline [Mon, 13 Jul 2015 07:37:51 +0000 (16:37 +0900)]
Pass signal strength thresholds inside a Bundle
Bug:
21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f
Lorenzo Colitti [Mon, 6 Jul 2015 14:50:27 +0000 (23:50 +0900)]
Support NetworkCallbacks based on signal strength.
Bug:
21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9
Lorenzo Colitti [Sat, 18 Jul 2015 17:24:05 +0000 (17:24 +0000)]
am
8bf977d5: ConnectivityManager API for for packet keepalives.
* commit '
8bf977d562b8f7261cf964bdf045b22bdbd92b7d':
ConnectivityManager API for for packet keepalives.
Lorenzo Colitti [Sat, 18 Jul 2015 17:24:01 +0000 (17:24 +0000)]
am
260a36d1: Make immutable NetworkCapabilities more explicit.
* commit '
260a36d1b20469d39490b61fca610271bfa53df2':
Make immutable NetworkCapabilities more explicit.
Lorenzo Colitti [Mon, 15 Jun 2015 05:29:22 +0000 (14:29 +0900)]
ConnectivityManager API for for packet keepalives.
Bug:
21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
Lorenzo Colitti [Wed, 8 Jul 2015 03:49:04 +0000 (12:49 +0900)]
Make immutable NetworkCapabilities more explicit.
Bug:
21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1
Jorim Jaggi [Sat, 18 Jul 2015 01:19:53 +0000 (01:19 +0000)]
am
9029ae2b: am
29cf9aea: Adjust fingerprint icon placement to spec
* commit '
9029ae2b89c5abf0fb7013e8b98216b3ae4a01c2':
Adjust fingerprint icon placement to spec
Jorim Jaggi [Sat, 18 Jul 2015 01:04:55 +0000 (01:04 +0000)]
am
29cf9aea: Adjust fingerprint icon placement to spec
* commit '
29cf9aea5490c42b85aaaa98b6784daff82629f8':
Adjust fingerprint icon placement to spec
Jorim Jaggi [Fri, 17 Jul 2015 19:00:34 +0000 (12:00 -0700)]
Adjust fingerprint icon placement to spec
Bug:
22502068
Change-Id: I12952cb1ea43f365d5a63ec2636a5d60a981b93f
Chris Craik [Sat, 18 Jul 2015 00:24:55 +0000 (00:24 +0000)]
am
b6e41a08: am
0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
* commit '
b6e41a08826d01dba3ad30c14e72e3531d22d0ad':
Fix AssetAtlas usage in BitmapShaders
Chris Craik [Sat, 18 Jul 2015 00:07:13 +0000 (00:07 +0000)]
am
0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
* commit '
0bb5c26bcea4b171583e57134b9717c77fbdcb14':
Fix AssetAtlas usage in BitmapShaders
Chris Craik [Fri, 17 Jul 2015 23:59:14 +0000 (23:59 +0000)]
Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
Adrian Roos [Fri, 17 Jul 2015 23:54:10 +0000 (23:54 +0000)]
am
1f72739a: am
57ee4b87: Merge "Fix image wallpaper size" into mnc-dev
* commit '
1f72739a0b546d8a26ec0f704fcfeaf9d051fd37':
Fix image wallpaper size
Jeff Sharkey [Fri, 17 Jul 2015 23:54:06 +0000 (23:54 +0000)]
am
80a3fbf4: am
c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev
* commit '
80a3fbf4082483065d462f0b2b0f5ff8cad22b5c':
Clear identity when killing media provider.
Chet Haase [Fri, 17 Jul 2015 23:41:11 +0000 (23:41 +0000)]
am
fcba54eb: am
d3f327be: Merge "Localize SimpleMonthView" into mnc-dev
* commit '
fcba54eb88e8f4ef867d2205485e391d9855ef4a':
Localize SimpleMonthView
Jeff Sharkey [Fri, 17 Jul 2015 23:41:08 +0000 (23:41 +0000)]
am
2d9d5905: am
25945302: Merge "Persist version data on a per-volume basis." into mnc-dev
* commit '
2d9d59053fcb8504914f358a1417e67a94c0f8f1':
Persist version data on a per-volume basis.
xinhe [Fri, 17 Jul 2015 23:41:03 +0000 (23:41 +0000)]
am
9b8ddb09: am
822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
* commit '
9b8ddb09042c72f0c2ebfbf1a2e967e3677fa680':
Add API to turn OFF "best network selection" feature
Adrian Roos [Fri, 17 Jul 2015 23:40:41 +0000 (23:40 +0000)]
am
57ee4b87: Merge "Fix image wallpaper size" into mnc-dev
* commit '
57ee4b87fee76d9f85d28a09e370a92b5839a8dd':
Fix image wallpaper size
Jeff Sharkey [Fri, 17 Jul 2015 23:40:37 +0000 (23:40 +0000)]
am
c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev
* commit '
c9eb398a1b0d7954b0d4f13fb46cae3042a99a75':
Clear identity when killing media provider.
Chet Haase [Fri, 17 Jul 2015 23:31:44 +0000 (23:31 +0000)]
am
d3f327be: Merge "Localize SimpleMonthView" into mnc-dev
* commit '
d3f327be2d1f8facd709895f2d05757351e8be07':
Localize SimpleMonthView
Jeff Sharkey [Fri, 17 Jul 2015 23:31:39 +0000 (23:31 +0000)]
am
25945302: Merge "Persist version data on a per-volume basis." into mnc-dev
* commit '
259453024c015da9d70d1ffadba09604aa1c786e':
Persist version data on a per-volume basis.
Adrian Roos [Fri, 17 Jul 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Fix image wallpaper size" into mnc-dev
Jeff Sharkey [Fri, 17 Jul 2015 23:29:51 +0000 (23:29 +0000)]
Merge "Clear identity when killing media provider." into mnc-dev
Chet Haase [Fri, 17 Jul 2015 23:27:54 +0000 (23:27 +0000)]
Merge "Localize SimpleMonthView" into mnc-dev
xinhe [Fri, 17 Jul 2015 23:26:50 +0000 (23:26 +0000)]
am
822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
* commit '
822f6141d4aca099e1dc37cda3bc861b2908df82':
Add API to turn OFF "best network selection" feature
Jeff Sharkey [Fri, 17 Jul 2015 22:12:39 +0000 (15:12 -0700)]
Clear identity when killing media provider.
Otherwise various shell "sm" commands fail because they don't hold
the right permissions.
Bug:
22564405
Change-Id: I88081e8a9b27ee43904d3ea6f745aba3af4e2150
Jeff Sharkey [Fri, 17 Jul 2015 23:20:35 +0000 (23:20 +0000)]
Merge "Persist version data on a per-volume basis." into mnc-dev
Jeff Sharkey [Fri, 17 Jul 2015 21:56:34 +0000 (14:56 -0700)]
Persist version data on a per-volume basis.
Now that we support multiple adopted external storage devices, we
need to keep track of version data for each volume. This means we
now correctly handle certificate upgrade edge cases, permission
regranting, and clearing of code caches on a per-volume basis.
Bug:
22298966
Change-Id: Ifb9940c197f6c058a3ecca728257f853ce0fd7f4
xinhe [Fri, 17 Jul 2015 23:13:03 +0000 (23:13 +0000)]
Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
Svetoslav Ganov [Fri, 17 Jul 2015 23:05:33 +0000 (23:05 +0000)]
am
41ec3923: am
fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '
41ec39230cd9c6b0d911f99854afc33dfc17e03d':
Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
Chris Craik [Fri, 17 Jul 2015 22:51:36 +0000 (15:51 -0700)]
Fix AssetAtlas usage in BitmapShaders
bug:
22521999
Change-Id: I60859748ceee19ebc89ec98845e550ea26e36ecd
Svetoslav Ganov [Fri, 17 Jul 2015 22:47:17 +0000 (22:47 +0000)]
am
fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '
fbc6f2cb6c5313ac246b8554764a719dd06582fc':
Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
Svetoslav Ganov [Fri, 17 Jul 2015 22:39:29 +0000 (22:39 +0000)]
Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
Christopher Tate [Fri, 17 Jul 2015 22:39:08 +0000 (15:39 -0700)]
Don't fall back to domain verification state when looking up app linkage state
This is in support of the always/never/ask UI tweaks in Settings: any
"assume always" fallback at the verification layer should not be
conflated with the user-facing semantic toggle. This was causing the
UI to report apps as being in the 'always open their links' state
inappropriately.
Bug
22532193
Change-Id: Iaa4bc3a2d5db814e1b0d96bc1c4ecfaafb1e3105
Dianne Hackborn [Fri, 17 Jul 2015 22:33:34 +0000 (22:33 +0000)]
am
fb03aa36: am
5c269121: Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
fb03aa36a4790ca0ff5e11a56903507089278390':
Work on issue #
22556778: Starting under voice control not allowed
Dianne Hackborn [Fri, 17 Jul 2015 22:17:58 +0000 (22:17 +0000)]
am
5c269121: Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
5c269121d8ea0bf3f530f2314695e189ffdb3165':
Work on issue #
22556778: Starting under voice control not allowed
Dianne Hackborn [Fri, 17 Jul 2015 22:03:44 +0000 (22:03 +0000)]
Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
Chet Haase [Fri, 17 Jul 2015 19:42:08 +0000 (12:42 -0700)]
Localize SimpleMonthView
The days of the month were not being localized, resulting in
English numbers for non-English languages. Now we format the numbers
with the current locale.
Issue #
22540629 [MRA14D][Arab][Token] numbers displayed in english
Change-Id: I2b17d55ba2d0aa47b5a28c8846c6cf9723ababb1
Svet Ganov [Fri, 17 Jul 2015 21:22:39 +0000 (21:22 +0000)]
am
2d92575a: am
5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '
2d92575ad0dbbf3bfee4f013f4b78fac06c0ab50':
Grant default permissions to default apps despite user choices.
Svet Ganov [Fri, 17 Jul 2015 21:10:16 +0000 (21:10 +0000)]
am
5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '
5ff4383b466fc26e6696a7bbeb6df5eb7a3c8cc5':
Grant default permissions to default apps despite user choices.
Svet Ganov [Fri, 17 Jul 2015 20:58:11 +0000 (20:58 +0000)]
Merge "Grant default permissions to default apps despite user choices." into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 20:46:01 +0000 (20:46 +0000)]
am
fa9a616d: am
4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit '
fa9a616de9664c4bd7212683facbd31dcd9c3bdd':
Do not auto grant GET_ACCOUNTS as it is temporarily normal
ztenghui [Fri, 17 Jul 2015 20:45:56 +0000 (20:45 +0000)]
am
8b455841: am
094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '
8b455841d9da1ac5ddf1b88e03c0c94613fd4046':
Scaling (Animated)VectorDrawable inside ImageView
Svet Ganov [Fri, 17 Jul 2015 01:56:16 +0000 (18:56 -0700)]
Grant default permissions to default apps despite user choices.
This implements the policy of granting default permissions to default
apps upon a selection despite past user permission choices. The act of
picking the app as the default one means the user expects it to work in
this capacity as SMS app, Phone app, Browser app.
bug:
22062549
Change-Id: I5e427f2b939e85bb8bbfd311cc271b96857a7ce6
Svetoslav Ganov [Fri, 17 Jul 2015 20:34:18 +0000 (20:34 +0000)]
Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
This reverts commit
33852d8cd21434b4106b8f2c504752ef34abb2da.
Change-Id: I29a212876c93ae0288967ffcff223abafad78827
Svet Ganov [Fri, 17 Jul 2015 20:32:28 +0000 (20:32 +0000)]
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
ztenghui [Fri, 17 Jul 2015 20:32:24 +0000 (20:32 +0000)]
am
094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '
094c82ada3799045588790252a64806b9930f8c2':
Scaling (Animated)VectorDrawable inside ImageView
Svet Ganov [Fri, 17 Jul 2015 20:27:33 +0000 (20:27 +0000)]
Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 20:21:32 +0000 (13:21 -0700)]
Do not auto grant GET_ACCOUNTS as it is temporarily normal
bug:
22550851
Change-Id: Iea5dd8fde07074220167a937b32208b1c9488d9d
ztenghui [Fri, 17 Jul 2015 20:21:14 +0000 (20:21 +0000)]
Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
Adrian Roos [Fri, 17 Jul 2015 19:29:53 +0000 (12:29 -0700)]
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
Julia Reynolds [Fri, 17 Jul 2015 19:11:10 +0000 (19:11 +0000)]
am
e0746d32: am
3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit '
e0746d32306ff20d864b465ff1d6cd249daedb9d':
Remove focusablilty of the status bar.
Wale Ogunwale [Fri, 17 Jul 2015 19:11:06 +0000 (19:11 +0000)]
am
25257ca5: am
af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit '
25257ca52e57b982ba71be040a7f261c66d37236':
Fixed bad merge conflict resolution
Mady Mellor [Fri, 17 Jul 2015 18:57:54 +0000 (18:57 +0000)]
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
Julia Reynolds [Fri, 17 Jul 2015 18:54:20 +0000 (18:54 +0000)]
am
3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit '
3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d':
Remove focusablilty of the status bar.
Wale Ogunwale [Fri, 17 Jul 2015 18:54:16 +0000 (18:54 +0000)]
am
af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit '
af81434023d19cfd486c84c210f2b6540a2bab35':
Fixed bad merge conflict resolution
Julia Reynolds [Fri, 17 Jul 2015 18:49:19 +0000 (18:49 +0000)]
Merge "Remove focusablilty of the status bar." into mnc-dev
Tingting Wang [Fri, 17 Jul 2015 18:45:41 +0000 (18:45 +0000)]
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."
Wale Ogunwale [Fri, 17 Jul 2015 18:44:55 +0000 (18:44 +0000)]
Merge "Fixed bad merge conflict resolution" into mnc-dev
Mady Mellor [Fri, 17 Jul 2015 18:44:51 +0000 (18:44 +0000)]
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
Tingting Wang [Fri, 17 Jul 2015 18:30:56 +0000 (18:30 +0000)]
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."
Mady Mellor [Fri, 17 Jul 2015 18:30:48 +0000 (18:30 +0000)]
Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
Dianne Hackborn [Fri, 17 Jul 2015 18:21:26 +0000 (11:21 -0700)]
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
Tingting Wang [Fri, 17 Jul 2015 18:19:54 +0000 (18:19 +0000)]
Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
ztenghui [Wed, 14 Jan 2015 00:21:11 +0000 (16:21 -0800)]
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
Svetoslav Ganov [Fri, 17 Jul 2015 18:01:58 +0000 (18:01 +0000)]
am
098a88e6: am
2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '
098a88e6a330c123c3daeda334e91c8656ecb4b2':
Revert "Temporary lower GET_ACCOUNTS protection level"
Svet Ganov [Fri, 17 Jul 2015 18:01:54 +0000 (18:01 +0000)]
am
7a8f2006: am
ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
* commit '
7a8f20065a777b130a1aa46dc2152e34190f1947':
Temporary lower GET_ACCOUNTS protection level
Svetoslav Ganov [Fri, 17 Jul 2015 17:47:54 +0000 (17:47 +0000)]
am
2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '
2a500e32169b53679db83077e57f3c9cd02cfd36':
Revert "Temporary lower GET_ACCOUNTS protection level"
Svet Ganov [Fri, 17 Jul 2015 17:47:49 +0000 (17:47 +0000)]
am
ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
* commit '
ecb887925a3ff3d54ecb6593932d4f866a6fe9e9':
Temporary lower GET_ACCOUNTS protection level
Svetoslav Ganov [Fri, 17 Jul 2015 17:36:54 +0000 (17:36 +0000)]
Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
Svetoslav Ganov [Fri, 17 Jul 2015 17:35:05 +0000 (17:35 +0000)]
Revert "Temporary lower GET_ACCOUNTS protection level"
This reverts commit
6e20ac343c22ab27e5ac7471bc1219df6bf11282.
Change-Id: I96b21bad9406abffa95c90abde509dc8dcf3eff5
Svet Ganov [Fri, 17 Jul 2015 17:34:14 +0000 (17:34 +0000)]
Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 17:24:37 +0000 (10:24 -0700)]
Temporary lower GET_ACCOUNTS protection level
bug:
22550851
Change-Id: If43f10639220f9a69d304b08def6d869658c2960
Chien-Yu Chen [Fri, 17 Jul 2015 17:20:09 +0000 (17:20 +0000)]
am
98977fa0: am
aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit '
98977fa042deb2109d7869f6217447d0c4387e08':
Camera2: Update FAST mode for EE and NR
Eino-Ville Talvala [Fri, 17 Jul 2015 17:20:05 +0000 (17:20 +0000)]
am
69508f49: am
6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
* commit '
69508f494e46d9055cb424d480bb48d433ad3462':
Camera2: Add hidden experimental tearDown method
Chien-Yu Chen [Fri, 17 Jul 2015 17:06:02 +0000 (17:06 +0000)]
am
aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit '
aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
Camera2: Update FAST mode for EE and NR
OSDN Git Service
