194285 Commits

Author SHA1 Message Date
Jae Seo
38b3257b7c TIF: Convert fields to local variables
Change-Id: Ide6c5ad36229410f30f7929c6dd511945d48aa6f
2015-06-05 14:53:21 -07:00
Wei Wang
a73c8b6fbf Merge "add gps gid to system_server" into mnc-dev 2015-06-05 21:34:11 +00:00
Christopher Tate
ad8a962316 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
2015-06-05 14:22:11 -07:00
Kevin Tang
c6432e5c72 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
2015-06-05 14:18:49 -07:00
Makoto Onuki
fba7f5d73c Merge "Fix crash on simplified Chinese." into mnc-dev 2015-06-05 21:18:27 +00:00
Jorim Jaggi
537bb5fce7 Fix vibration for assist gesture
Bug: 21549531
Change-Id: I038dd29228646ce6d08da8543c59823cfbb21167
2015-06-05 20:21:37 +00:00
Jorim Jaggi
3bb96c7b3b Merge "Refinements for app transitions" into mnc-dev 2015-06-05 20:19:40 +00:00
Chris Wren
dfa4af2dfa Merge "remove obsolete notification visibility log" into mnc-dev 2015-06-05 20:13:47 +00:00
Chris Wren
7a4f9ca937 remove obsolete notification visibility log
Bug: 21248682
Change-Id: I8656a924514dd01ebc003f3cc81b1a9316919321
2015-06-05 16:12:18 -04:00
Adam Powell
cedc7b3ba4 Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 2015-06-05 20:07:07 +00:00
Adam Lesinski
7b83b0c75c Update docs to reflect correct time units
Change-Id: Id2757e45e989b148671cf83d51011984e07cd017
2015-06-05 12:59:36 -07:00
Jorim Jaggi
1d763a6d60 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
2015-06-05 11:42:34 -07:00
Amith Yamasani
8fa24e91c4 Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev 2015-06-05 18:36:08 +00:00
Amit Mahajan
48cf298cb8 Merge "Change to hide BEARER_BITMASK." into mnc-dev 2015-06-05 18:24:05 +00:00
Chris Wren
b1e0438ce3 Merge "add a log for notification alerts." into mnc-dev 2015-06-05 18:22:21 +00:00
Jorim Jaggi
853cbe38c9 Don't play lock sound when just resetting Keyguard
Bug: 21595440
Change-Id: I9bd470d051f4851dcde83099f1ba1f0a9bae429a
2015-06-05 18:12:34 +00:00
Jae Seo
5f18527037 Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev 2015-06-05 18:05:33 +00:00
Jae Seo
c3426128fe Merge "TIF: Remove unused imports" into mnc-dev 2015-06-05 17:58:42 +00:00
Jae Seo
36a8fd83b3 TIF: Remove unused imports
Change-Id: I1419a8e44d82fa009ccd6170d9048c3e24f51a2b
2015-06-05 10:51:52 -07:00
Chris Wren
82ba59de0e add a log for notification alerts.
Bug: 21242827
Change-Id: I1b8beee5cc12a9cd23e81554f7f2236ddc29e2b6
2015-06-05 13:49:59 -04:00
Makoto Onuki
98112e886d Fix crash on simplified Chinese.
They use the standard A/B sizes in China too.

Bug 20340812

Change-Id: Ia0842f8ddbdcb4cb2738b746509c60de25b64966
2015-06-05 10:47:44 -07:00
Jae Seo
4640d3d81a TIF: Add more explanation for notifyChannelRetuned
Bug: 21277081
Change-Id: Ia4de27bc0ecdf49bcad83cfcd396e8d55dc8343a
2015-06-05 10:34:20 -07:00
Alan Viverette
4034e0ecc3 Merge "Fix inverse subhead color" into mnc-dev 2015-06-05 17:29:41 +00:00
Alan Viverette
739b76b7e8 Fix inverse subhead color
Bug: 21650211
Change-Id: Ie1b8ecff4ff0c6b0e6e9b321c76cbb56c277e264
2015-06-05 10:26:03 -07:00
Alan Viverette
a06b41b06e Merge "Avoid NPE when drawable fails to load" into mnc-dev 2015-06-05 17:20:41 +00:00
Alan Viverette
42cc892be1 Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 2015-06-05 17:18:47 +00:00
Alan Viverette
0f1c95edf8 Avoid NPE when drawable fails to load
Bug: 17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
2015-06-05 10:17:21 -07:00
Filip Gruszczynski
eb974d5ac4 Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev 2015-06-05 16:59:48 +00:00
Filip Gruszczynski
b0c673b50e resolved conflicts for merge of f6a04305 to mnc-dev
Change-Id: I92e666bfd6d8ad051bdee7dce5712b9cb8e6a01d
2015-06-05 09:43:06 -07:00
ztenghui
e1352de673 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:10 +00:00
Clara Bayarri
3e85c1ed0c Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 2015-06-05 16:19:31 +00:00
Adam Powell
14d1f1383f 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
2015-06-05 08:51:45 -07:00
Mady Mellor
0f2f9f7a51 Merge "Stylus scale - API review feedback" into mnc-dev 2015-06-05 15:50:52 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
2015-06-05 14:41:51 +00:00
Jason Monk
44fdcf2642 Merge "Update no wifi networks string" into mnc-dev 2015-06-05 14:22:16 +00:00
Jason Monk
e12485fdc5 Update no wifi networks string
Bug: 21530009
Change-Id: I910b2c062252c69f71e29744f6029c6e2557947d
2015-06-05 10:15:02 -04:00
Selim Cinek
e067ff4357 Merge "Removed Log message when expanding from HUN" into mnc-dev 2015-06-05 13:29:37 +00:00
Selim Cinek
1ceee65c20 Merge "Removed the arrow from the hint animation" into mnc-dev 2015-06-05 13:28:57 +00:00
Selim Cinek
c699b87130 Merge "Fixed a bug with HUNS and dreams" into mnc-dev 2015-06-05 13:27:49 +00:00
Zoltan Szatmary-Ban
c92550e4b4 Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 2015-06-05 09:59:02 +00:00
Martijn Coenen
a2344eac37 Remove NFC CardEmulation dynamic resource APIs.
No longer needed.

Bug: 21343778
Change-Id: I5188c4bc819146861d346f3f4339f002b7173027
2015-06-05 10:45:50 +02:00
Lorenzo Colitti
06400475c7 Delete code that checks for the simulator, it's long gone.
Exhibit A: http://b/5010576

Bug: 19316303
Change-Id: I093e4320f12459adaa51c6a14350e7a60e02937d
2015-06-05 17:21:29 +09:00
Lorenzo Colitti
a34af2c0d7 Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev 2015-06-05 07:50:44 +00:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
2015-06-04 20:21:23 -07:00
Abodunrinwa Toki
4741f6a4c7 Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 2015-06-05 03:08:09 +00:00
Johnson Hsieh
997f3ccad3 Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 2015-06-05 02:58:42 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java.
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
2015-06-04 19:51:52 -07:00
Abodunrinwa Toki
9e211282d3 Fix ActionMode.snooze API
Bug: 21572677
Change-Id: If9fdb8ace3773b983418b0148082712644fd1fa5
2015-06-05 03:35:15 +01:00
John Reck
30ff6523a7 am 06ae68aa: am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs
* commit '06ae68aac222e1ba06169c5125e0689a30d13b09':
  Fix framestats docs ordering
2015-06-05 02:27:26 +00:00