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

194257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heidi von Markham
25af46b07d Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 2015-06-06 00:07:02 +00:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00
Joe Fernandez
c37d84ac08 am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'edaf008c5e594d140aa430965a779f0b35280730':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:06:25 +00:00
Justin Harrison
c3b9156e28 am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '6715ef754a72fdc2477257051e539c38aae6afcd':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:06:07 +00:00
Justin Harrison
9445df6f0b am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '95be178dafd0dfefcae060f65df296cb523f82a4':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:06:02 +00:00
Rich Slogar
3a2a310429 am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit '34bebb044062ebb783705c420b8a2e6b38d6af04':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:05:44 +00:00
Luan Nguyen
1877a32f21 am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '26c3dd5b0302ea6dcb353be2df8cfaf5f8ca5622':
  docs: Add DevByte embedded video.
 2015-06-06 00:05:05 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Svetoslav
772ca6cf2a Merge "Update SMS permission description string" into mnc-dev 2015-06-05 23:53:46 +00:00
Svetoslav
cfbca74bfa Update SMS permission description string 
Change-Id: I777615113dbdcd0df1b5f4984ae18bfa57976ba3
 2015-06-05 16:50:51 -07:00
Christopher Tate
97c699e2bd Merge "Don't run backups in battery-saver mode" into mnc-dev 2015-06-05 23:50:44 +00:00
James Cook
74f3d39671 Merge "Allow different visual and voice assist prompts" into mnc-dev 2015-06-05 23:49:59 +00:00
Sanket Padawe
912f705f1f Merge "Suppress default logging in SubscriptionManager." into mnc-dev 2015-06-05 23:45:45 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +00:00
James Cook
6cf397508e 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
 2015-06-05 16:36:22 -07:00
Adam Lesinski
8e518c81ea Merge "Update docs to reflect correct time units" into mnc-dev 2015-06-05 23:31:28 +00:00
Stefan Kuhne
16045c24fe 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
 2015-06-05 16:30:29 -07:00
Jae Seo
093d994965 TIF: Replace explicit types with <> 
Also removed unnecessary boxing/unboxing

Change-Id: I97ef6b7f369cac97a133180773be96463f2a813d
 2015-06-05 16:24:57 -07:00
Sanket Padawe
28964eb236 Suppress default logging in SubscriptionManager. 
Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
 2015-06-05 16:13:51 -07:00
Jae Seo
b40933defe Merge "TIF: Convert fields to local variables" into mnc-dev 2015-06-05 23:04:03 +00:00
ztenghui
5dfe9d30b4 Merge "Add reset to AVD" into mnc-dev 2015-06-05 22:47:30 +00:00
Yang Ni
6f4610bdad Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev 2015-06-05 22:43:27 +00:00
ztenghui
9605271806 Add reset to AVD 
b/21664621

Change-Id: Ie40c3723860e183c8e4fedd2a76b9debbdf64a2a
 2015-06-05 15:42:59 -07:00
Jonathan Basseri
6412856358 Merge "Renaming carrier config variable keys." into mnc-dev 2015-06-05 22:29:53 +00:00
Jonathan Basseri
69822f0d63 Renaming carrier config variable keys. 
API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
 2015-06-05 15:08:55 -07:00
Jorim Jaggi
c554b77b73 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
 2015-06-05 22:00:33 +00:00
Zhijun He
d24e49bba8 Camera2: add missing HFR implementation 
Bug: 21442271
Change-Id: I08c0a5b75ccb0f737013026511cfe3bf9e15c744
 2015-06-05 14:55:04 -07:00
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