OSDN Git Service
Christopher Tate [Fri, 5 Jun 2015 23:50:32 +0000 (23:50 +0000)]
Merge "Don't run backups in battery-saver mode" into mnc-dev
James Cook [Fri, 5 Jun 2015 23:49:57 +0000 (23:49 +0000)]
Merge "Allow different visual and voice assist prompts" into mnc-dev
Sanket Padawe [Fri, 5 Jun 2015 23:45:40 +0000 (23:45 +0000)]
Merge "Suppress default logging in SubscriptionManager." into mnc-dev
Stefan Kuhne [Fri, 5 Jun 2015 23:37:13 +0000 (23:37 +0000)]
Merge "Adding am send-trim-memory command" into mnc-dev
James Cook [Thu, 4 Jun 2015 21:18:43 +0000 (14:18 -0700)]
Allow different visual and voice assist prompts
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.
Bug:
21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
Adam Lesinski [Fri, 5 Jun 2015 23:31:18 +0000 (23:31 +0000)]
Merge "Update docs to reflect correct time units" into mnc-dev
Stefan Kuhne [Fri, 5 Jun 2015 14:18:06 +0000 (07:18 -0700)]
Adding am send-trim-memory command
This patch adds a send-trim-memory command to the ActivityManager to allow
for better debugging&testing.
The command is
adb shell am send-trim-memory [--user <USER_ID>] <PROCESS> <LEVEL>
whereas LEVEL can be one of the following:
[HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|
RUNNING_CRITICAL|COMPLETE]
Bug:
21633189
Change-Id: I7a41ce02c3c9043ffd3e5aaa791f7b7306a9de49
Jae Seo [Fri, 5 Jun 2015 23:13:03 +0000 (16:13 -0700)]
TIF: Replace explicit types with <>
Also removed unnecessary boxing/unboxing
Change-Id: I97ef6b7f369cac97a133180773be96463f2a813d
Sanket Padawe [Fri, 5 Jun 2015 23:13:51 +0000 (16:13 -0700)]
Suppress default logging in SubscriptionManager.
Bug:
20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
Jae Seo [Fri, 5 Jun 2015 23:04:02 +0000 (23:04 +0000)]
Merge "TIF: Convert fields to local variables" into mnc-dev
ztenghui [Fri, 5 Jun 2015 22:46:47 +0000 (22:46 +0000)]
Merge "Add reset to AVD" into mnc-dev
Yang Ni [Fri, 5 Jun 2015 22:43:25 +0000 (22:43 +0000)]
Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev
ztenghui [Fri, 5 Jun 2015 22:22:24 +0000 (15:22 -0700)]
Add reset to AVD
b/
21664621
Change-Id: Ie40c3723860e183c8e4fedd2a76b9debbdf64a2a
Jonathan Basseri [Fri, 5 Jun 2015 22:29:47 +0000 (22:29 +0000)]
Merge "Renaming carrier config variable keys." into mnc-dev
Jonathan Basseri [Thu, 4 Jun 2015 20:48:08 +0000 (13:48 -0700)]
Renaming carrier config variable keys.
API council advised us to use KEY_NAME_TYPE for our key constants.
Bug:
21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
Jorim Jaggi [Thu, 4 Jun 2015 23:07:57 +0000 (16:07 -0700)]
Skip first frame for app transitions when possible
In most of our standard app transitions, the first frame of a
transition results in the same contents on the screen. This is
inefficient, as we can directly skip to the second frame of the
transition, introduce no jank, but execute the transition 16ms
faster.
Change-Id: If58337eae5558eae3acced691ae01c769f0ec2b9
Jae Seo [Fri, 5 Jun 2015 21:43:11 +0000 (14:43 -0700)]
TIF: Convert fields to local variables
Change-Id: Ide6c5ad36229410f30f7929c6dd511945d48aa6f
Wei Wang [Fri, 5 Jun 2015 21:34:00 +0000 (21:34 +0000)]
Merge "add gps gid to system_server" into mnc-dev
Christopher Tate [Fri, 5 Jun 2015 21:17:43 +0000 (14:17 -0700)]
Don't run backups in battery-saver mode
Defer both full-data and key/value backups while in battery-saver mode.
Bug
21563473
Change-Id: I081b7bcd19af21a4c88ebb434d2d3ef4bc93951f
Kevin Tang [Tue, 23 Jul 2013 17:16:48 +0000 (10:16 -0700)]
add gps gid to system_server
system_server hosts gps service, it should pocess gps
gid, so it can communicate with native gps daemons.
Change-Id: I59d7e99ec996891b19fa15a3ed66e055e6bccad8
Makoto Onuki [Fri, 5 Jun 2015 21:18:16 +0000 (21:18 +0000)]
Merge "Fix crash on simplified Chinese." into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 00:38:20 +0000 (17:38 -0700)]
Fix vibration for assist gesture
Bug:
21549531
Change-Id: I038dd29228646ce6d08da8543c59823cfbb21167
Jorim Jaggi [Fri, 5 Jun 2015 20:19:35 +0000 (20:19 +0000)]
Merge "Refinements for app transitions" into mnc-dev
Chris Wren [Fri, 5 Jun 2015 20:13:46 +0000 (20:13 +0000)]
Merge "remove obsolete notification visibility log" into mnc-dev
Chris Wren [Fri, 5 Jun 2015 20:12:18 +0000 (16:12 -0400)]
remove obsolete notification visibility log
Bug:
21248682
Change-Id: I8656a924514dd01ebc003f3cc81b1a9316919321
Adam Powell [Fri, 5 Jun 2015 20:04:00 +0000 (20:04 +0000)]
Merge "Use real rounding in ImageView bounds configuration" into mnc-dev
Adam Lesinski [Fri, 5 Jun 2015 19:59:36 +0000 (12:59 -0700)]
Update docs to reflect correct time units
Change-Id: Id2757e45e989b148671cf83d51011984e07cd017
Jorim Jaggi [Wed, 3 Jun 2015 00:07:39 +0000 (17:07 -0700)]
Refinements for app transitions
- Use refined interpolator for most of the transitions which respond
to touch faster than a normal fast_out_slow_in interpolator.
- Tune clip reveal animation: Get rid of horizontal movement, only do
slight vertical movement, and make horizontal reveal animation faster
so there is a more staggered animation to resemble an opening paper
Change-Id: Id94328906f9b194fb97d702e9b102c7aeef96bb8
Amith Yamasani [Fri, 5 Jun 2015 18:36:06 +0000 (18:36 +0000)]
Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev
Amit Mahajan [Fri, 5 Jun 2015 18:24:03 +0000 (18:24 +0000)]
Merge "Change to hide BEARER_BITMASK." into mnc-dev
Chris Wren [Fri, 5 Jun 2015 18:22:20 +0000 (18:22 +0000)]
Merge "add a log for notification alerts." into mnc-dev
Jorim Jaggi [Thu, 4 Jun 2015 23:31:54 +0000 (16:31 -0700)]
Don't play lock sound when just resetting Keyguard
Bug:
21595440
Change-Id: I9bd470d051f4851dcde83099f1ba1f0a9bae429a
Jae Seo [Fri, 5 Jun 2015 18:05:32 +0000 (18:05 +0000)]
Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 17:58:26 +0000 (17:58 +0000)]
Merge "TIF: Remove unused imports" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 17:51:52 +0000 (10:51 -0700)]
TIF: Remove unused imports
Change-Id: I1419a8e44d82fa009ccd6170d9048c3e24f51a2b
Chris Wren [Fri, 5 Jun 2015 15:23:44 +0000 (11:23 -0400)]
add a log for notification alerts.
Bug:
21242827
Change-Id: I1b8beee5cc12a9cd23e81554f7f2236ddc29e2b6
Makoto Onuki [Thu, 4 Jun 2015 23:38:48 +0000 (16:38 -0700)]
Fix crash on simplified Chinese.
They use the standard A/B sizes in China too.
Bug
20340812
Change-Id: Ia0842f8ddbdcb4cb2738b746509c60de25b64966
Jae Seo [Fri, 5 Jun 2015 17:34:20 +0000 (10:34 -0700)]
TIF: Add more explanation for notifyChannelRetuned
Bug:
21277081
Change-Id: Ia4de27bc0ecdf49bcad83cfcd396e8d55dc8343a
Alan Viverette [Fri, 5 Jun 2015 17:29:39 +0000 (17:29 +0000)]
Merge "Fix inverse subhead color" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:26:03 +0000 (10:26 -0700)]
Fix inverse subhead color
Bug:
21650211
Change-Id: Ie1b8ecff4ff0c6b0e6e9b321c76cbb56c277e264
Alan Viverette [Fri, 5 Jun 2015 17:19:30 +0000 (17:19 +0000)]
Merge "Avoid NPE when drawable fails to load" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:18:45 +0000 (17:18 +0000)]
Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:17:21 +0000 (10:17 -0700)]
Avoid NPE when drawable fails to load
Bug:
17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
Filip Gruszczynski [Fri, 5 Jun 2015 16:59:44 +0000 (16:59 +0000)]
Merge "resolved conflicts for merge of
f6a04305 to mnc-dev" into mnc-dev
Filip Gruszczynski [Fri, 5 Jun 2015 16:43:06 +0000 (09:43 -0700)]
resolved conflicts for merge of
f6a04305 to mnc-dev
Change-Id: I92e666bfd6d8ad051bdee7dce5712b9cb8e6a01d
ztenghui [Fri, 5 Jun 2015 16:37:09 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
Clara Bayarri [Fri, 5 Jun 2015 16:19:29 +0000 (16:19 +0000)]
Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev
Adam Powell [Thu, 4 Jun 2015 19:56:00 +0000 (12:56 -0700)]
Use real rounding in ImageView bounds configuration
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.
Bug
20145160
Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
Mady Mellor [Fri, 5 Jun 2015 15:50:48 +0000 (15:50 +0000)]
Merge "Stylus scale - API review feedback" into mnc-dev
Chet Haase [Thu, 4 Jun 2015 21:01:29 +0000 (14:01 -0700)]
Hide View.getBackgroundColor() prior to removal
Issue #
21572678 API Review: android.view.View.getBackgroundColor()
Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
Jason Monk [Fri, 5 Jun 2015 14:22:15 +0000 (14:22 +0000)]
Merge "Update no wifi networks string" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 14:15:02 +0000 (10:15 -0400)]
Update no wifi networks string
Bug:
21530009
Change-Id: I910b2c062252c69f71e29744f6029c6e2557947d
Selim Cinek [Fri, 5 Jun 2015 13:29:34 +0000 (13:29 +0000)]
Merge "Removed Log message when expanding from HUN" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:28:55 +0000 (13:28 +0000)]
Merge "Removed the arrow from the hint animation" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:27:47 +0000 (13:27 +0000)]
Merge "Fixed a bug with HUNS and dreams" into mnc-dev
Zoltan Szatmary-Ban [Fri, 5 Jun 2015 09:59:01 +0000 (09:59 +0000)]
Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev
Lorenzo Colitti [Fri, 5 Jun 2015 07:50:41 +0000 (07:50 +0000)]
Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev
Zhijun He [Fri, 5 Jun 2015 03:33:58 +0000 (03:33 +0000)]
Merge "Camera2: fix doc build" into mnc-dev
Zhijun He [Fri, 5 Jun 2015 03:21:23 +0000 (20:21 -0700)]
Camera2: fix doc build
Bug:
21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
Abodunrinwa Toki [Fri, 5 Jun 2015 03:08:08 +0000 (03:08 +0000)]
Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev
Johnson Hsieh [Fri, 5 Jun 2015 02:58:40 +0000 (02:58 +0000)]
Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev
Johnson Hsieh [Fri, 5 Jun 2015 02:51:27 +0000 (19:51 -0700)]
Fix build: documentation error in AlarmClock.java.
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
John Reck [Fri, 5 Jun 2015 02:27:26 +0000 (02:27 +0000)]
am
06ae68aa: am
902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs
* commit '
06ae68aac222e1ba06169c5125e0689a30d13b09':
Fix framestats docs ordering
David Friedman [Fri, 5 Jun 2015 02:18:53 +0000 (02:18 +0000)]
am
cae82287: am
6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs
* commit '
cae82287c704c000d304fdd3447dd693e2801c14':
Docs: Fixes several typos on Android Studio index.html page.
Dirk Dougherty [Fri, 5 Jun 2015 02:18:42 +0000 (02:18 +0000)]
am
392f5321: am
5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs
* commit '
392f532104aeba2d395bdf940cc08a1247bd3de5':
Fix dependency specs for data binding.
Filip Gruszczynski [Fri, 5 Jun 2015 02:18:35 +0000 (02:18 +0000)]
am
93634166: am
d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit '
93634166c8c78bdeccf045c62a0f601dceed74e3':
ActivityView: set surface on a background thread.
Chris Craik [Fri, 5 Jun 2015 02:18:29 +0000 (02:18 +0000)]
am
78ab4c38: am
6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs
* commit '
78ab4c3867af40b512d2e0c046abd5c8b040d05f':
Rework systrace analysis documentation
Joe Fernandez [Fri, 5 Jun 2015 02:18:23 +0000 (02:18 +0000)]
am
ab1fb237: am
79106d1c: docs: Remove ADT-1 RMA form link
* commit '
ab1fb23712c66286285ffdce2d1488c41565650f':
docs: Remove ADT-1 RMA form link
Clara Bayarri [Fri, 5 Jun 2015 02:05:43 +0000 (02:05 +0000)]
Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev
Clara Bayarri [Tue, 2 Jun 2015 23:46:29 +0000 (00:46 +0100)]
Fix Toolbar is not refreshed after Select All
Bug:
21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
Lorenzo Colitti [Fri, 5 Jun 2015 01:57:29 +0000 (10:57 +0900)]
Remove "returning Blocked NetworkInfo" logspam.
Bug:
20006730
Change-Id: I2061127e3c7283c0a4899940d3fc224ca114f754
Clara Bayarri [Wed, 3 Jun 2015 20:52:02 +0000 (21:52 +0100)]
Fix Select All should not be shown when everything is already selected
Condition Select All on whether the full text is already selected,
and add/remove this item when needed on ActionMode invalidation.
Bug:
21608943
Change-Id: Iad5f8a77a03b98024f7dcf355b2f7f0d1338b94a
Adam Lesinski [Fri, 5 Jun 2015 01:35:13 +0000 (01:35 +0000)]
Merge "AAPT2: Add manifest merging" into mnc-dev
Zhijun He [Fri, 5 Jun 2015 01:07:51 +0000 (01:07 +0000)]
Merge "Camera2: implement high speed video APIs" into mnc-dev
Mady Mellor [Fri, 5 Jun 2015 01:03:49 +0000 (18:03 -0700)]
Stylus scale - API review feedback
Fixed typo and javadoc error.
Bug:
21572278
Change-Id: Ia710971f1f4a97df7ed8e898d972f617465900b9
Adam Lesinski [Wed, 20 May 2015 22:24:01 +0000 (15:24 -0700)]
AAPT2: Add manifest merging
Now that AAPT2 is library-aware, it needs to take care of
all library related work, including merging manifests.
The logic was taken from the current Java ManifestMerger.
Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
Amith Yamasani [Fri, 5 Jun 2015 00:58:11 +0000 (17:58 -0700)]
Fix permission check in DPM.getPermissionGrantState
It was querying for permission of user 0 instead of the calling user.
Switched to passing in the explicity userId.
Also set the flags before granting/revoking permission from DPM.
Bug:
21430988
Change-Id: Id0d2dc65e20108cefa3eeb4363f866d49c791cc4
Doris Liu [Fri, 5 Jun 2015 00:57:30 +0000 (00:57 +0000)]
Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev
Ben Kwa [Fri, 5 Jun 2015 00:51:53 +0000 (00:51 +0000)]
Merge "Fix drawer selection to match Material spec." into mnc-dev
Doris Liu [Thu, 4 Jun 2015 18:11:14 +0000 (11:11 -0700)]
Make ListView's EdgeEffect respect the clipToPadding flag
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.
Bug:
21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
Svet Ganov [Fri, 5 Jun 2015 00:49:42 +0000 (00:49 +0000)]
Merge "Update the pdfium library - framework" into mnc-dev
Clara Bayarri [Fri, 5 Jun 2015 00:40:41 +0000 (00:40 +0000)]
Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev
Dongwon Kang [Fri, 5 Jun 2015 00:27:01 +0000 (00:27 +0000)]
Merge "TIF: Add sanitization code for the current position" into mnc-dev
Dongwon Kang [Tue, 2 Jun 2015 06:05:33 +0000 (15:05 +0900)]
TIF: Add sanitization code for the current position
+ More documentation on the currnet position
Bug:
21573422
Change-Id: I51d184d03a61270d3ea36b36f880f1f052a99cd1
Wale Ogunwale [Fri, 5 Jun 2015 00:23:25 +0000 (00:23 +0000)]
Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev
Roozbeh Pournader [Thu, 4 Jun 2015 23:45:26 +0000 (23:45 +0000)]
Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev
Abodunrinwa Toki [Thu, 4 Jun 2015 21:17:47 +0000 (22:17 +0100)]
TextView: Make sure the contentRect is within visibile bounds.
Bug:
21620604
Change-Id: Idd0d891e423316b2ebacf883fd3cbfff9ef69743
Johnson Hsieh [Thu, 4 Jun 2015 23:34:35 +0000 (23:34 +0000)]
Merge "Updates AlarmClock intent API." into mnc-dev
Ben Kwa [Thu, 4 Jun 2015 16:10:05 +0000 (09:10 -0700)]
Fix drawer selection to match Material spec.
- highlighted text changed to match the application primary color
- change highlighted background to light gray
- remove highlight icon tinting (provides insufficient contrast against
the new light gray background)
BUG=
18685226
Change-Id: I4040fa951fd2822cea324e0bd1924d10024b6a11
Yohei Yukawa [Thu, 4 Jun 2015 23:12:02 +0000 (23:12 +0000)]
Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev
Makoto Onuki [Thu, 4 Jun 2015 22:46:33 +0000 (22:46 +0000)]
Merge "Change option label from "Duplex" to "Two-sided"" into mnc-dev
Alan Viverette [Thu, 4 Jun 2015 22:41:15 +0000 (22:41 +0000)]
Merge "Manually jump ripples when preemptively aborting RT animation" into mnc-dev
Roozbeh Pournader [Thu, 4 Jun 2015 22:22:11 +0000 (15:22 -0700)]
Move NotoSansSymbols higher than CJK in the fallback chain.
This makes sure that symbol characters who have both an alternative
or "full-width" version in the CJK fonts and a more regular version
in the symbols font get the default or "half-width" version by
default in non-CJK locales.
This is not a complete fix: such "full-width" symbol characters only
exist in the Simplfied Chinese font for now, which means in
Traditional Chinese, Japanese, and Korean locales, they characters
would now appear "half-width", which *may* be sub-optimal. The
complete fix would make sure the ones that actually need to be
"full-width" in TC/J/K are also included in the TC/J/K font.
Bug:
21525318
Bug:
21525012
Bug:
21524421
Bug:
21521330
Bug:
21520316
Bug:
21518544
Bug:
21517912
Bug:
21503807
Bug:
21502245
Bug:
21501669
Bug:
21525905
Bug:
21524018
Bug:
21503952
Bug:
21502678
Change-Id: I93cf7119b45ed3c080cd39d631a687e0ef9fd8ce
Alan Viverette [Thu, 4 Jun 2015 22:33:52 +0000 (15:33 -0700)]
Manually jump ripples when preemptively aborting RT animation
Bug:
21079749
Change-Id: If79dcef59aba616c0446efc623863f563cb16250
Jorim Jaggi [Thu, 4 Jun 2015 22:30:47 +0000 (22:30 +0000)]
Merge "Speed up recents -> app #2" into mnc-dev
Jorim Jaggi [Thu, 4 Jun 2015 22:30:26 +0000 (22:30 +0000)]
Merge "Speed up recents -> app" into mnc-dev
Zhijun He [Mon, 1 Jun 2015 23:36:06 +0000 (16:36 -0700)]
Camera2: implement high speed video APIs
Bug:
21442271
Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
Alex Klyubin [Thu, 4 Jun 2015 22:16:17 +0000 (22:16 +0000)]
Merge "Export KeyFactory backed by Android Keystore." into mnc-dev
Svet Ganov [Thu, 4 Jun 2015 21:49:16 +0000 (14:49 -0700)]
Update the pdfium library - framework
Change-Id: I4880e9310c02c6e26d4560fb8515f2ce51c597f4
John Reck [Thu, 4 Jun 2015 21:54:07 +0000 (21:54 +0000)]
Merge "Iterate step of launch & iterate" into mnc-dev