Commit Graph

4504 Commits

Author SHA1 Message Date
Ruben Brunk
4335fbfe17 am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '533514c9b5bf05bbba33e2499618fa3c47f31451':
  Add UI for camera + flashlight battery reporting.
2015-06-06 00:29:50 +00:00
James Cook
80a250a3c8 am 715c502b: am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev
* commit '715c502bedee1e414d9d420d35e91a8f2920f25a':
  Allow different visual and voice assist prompts
2015-06-06 00:18:47 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Adam Lesinski
c12b8d3c6d am f926e3b9: am 8e518c81: Merge "Update docs to reflect correct time units" into mnc-dev
* commit 'f926e3b9bf26318b4b207afb25887165bf12e533':
  Update docs to reflect correct time units
2015-06-05 23:46:46 +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
Wei Wang
d3c9fc57f7 am 01b8f2cd: am a73c8b6f: Merge "add gps gid to system_server" into mnc-dev
* commit '01b8f2cd62d246d04a24366f20a5ddfcd5f014cf':
  add gps gid to system_server
2015-06-05 21:56:46 +00: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
Adam Lesinski
7b83b0c75c Update docs to reflect correct time units
Change-Id: Id2757e45e989b148671cf83d51011984e07cd017
2015-06-05 12:59:36 -07:00
Abodunrinwa Toki
5e516a7531 am 4bbc9f4d: am 4741f6a4: Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev
* commit '4bbc9f4d52c9bc219318c38593a2ff05c07d652e':
  TextView: Make sure the contentRect is within visibile bounds.
2015-06-05 03:31:01 +00:00
Abodunrinwa Toki
601523ad00 TextView: Make sure the contentRect is within visibile bounds.
Bug: 21620604
Change-Id: Idd0d891e423316b2ebacf883fd3cbfff9ef69743
2015-06-05 00:42:06 +01:00
Ruben Brunk
5b1308f02d Add UI for camera + flashlight battery reporting.
Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09
2015-06-04 16:41:11 -07:00
Abodunrinwa Toki
ce36d78ac3 am 7814e92f: am 2fe44efc: Merge "Also refresh FloatingToolbar for "icon" menu item changes." into mnc-dev
* commit '7814e92f7f2e76b4e517adfc496db006284f518a':
  Also refresh FloatingToolbar for "icon" menu item changes.
2015-06-04 19:22:59 +00:00
Abodunrinwa Toki
2fe44efced Merge "Also refresh FloatingToolbar for "icon" menu item changes." into mnc-dev 2015-06-04 17:09:11 +00:00
Yohei Yukawa
e09356c0e5 am 4b0f5442: am cc71518a: Merge "Include InputMethodSubtypeSwitchingController in state dump." into mnc-dev
* commit '4b0f544285e6cb270a9cbf09d56b0df432960293':
  Include InputMethodSubtypeSwitchingController in state dump.
2015-06-04 09:59:14 +00:00
Yohei Yukawa
cc71518aef Merge "Include InputMethodSubtypeSwitchingController in state dump." into mnc-dev 2015-06-04 08:06:10 +00:00
Yohei Yukawa
d724886cc1 Include InputMethodSubtypeSwitchingController in state dump.
In order to diagnose IME issues in multi-user / multi-profile
environment, internal state of
InputMethodSubtypeSwitchingController needs to be included in
the bugreport.

Bug: 19340792
Bug: 19587437
Bug: 21612582
Change-Id: I34aca2c1a4330ec08b5e40441e631809a8bb844e
2015-06-04 00:13:50 -07:00
Abodunrinwa Toki
b84975d090 am 34a29798: am bbb4c614: Merge "Fix floating toolbar position issues." into mnc-dev
* commit '34a29798e961b692ad7096bbd3e9217e19899e76':
  Fix floating toolbar position issues.
2015-06-04 00:27:08 +00:00
Abodunrinwa Toki
e3eb183350 Fix floating toolbar position issues.
This CL makes the toolbar respect a viewport specified by
the content area (calculated from the globalVisibleRect and
windowInsets). By doing this the toolbar positions
itself appropraitely avoiding the status and nav bars.

Bug: 21324303
Change-Id: I3de9e114194dd43888b7f581ef12c3f8b813b3ca
2015-06-03 20:33:49 +01:00
Abodunrinwa Toki
60416891d2 am 24a28fa6: am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev
* commit '24a28fa62919a82ced1371ea7fdc6c1091bb0273':
  Fix FloatingToolbar positioning for RTL.
2015-06-03 18:49:09 +00:00
Yohei Yukawa
fd417eb405 am 5acad932: am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev
* commit '5acad9323ad656977ca0d10fd4ebe5f4a661e8e4':
  Convert subtypes whose locale is "tl" to "fil".
2015-06-03 18:49:04 +00:00
Abodunrinwa Toki
96e727d1e6 Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 2015-06-03 17:47:47 +00:00
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Abodunrinwa Toki
6cb5cc19d4 Fix FloatingToolbar positioning for RTL.
-The position of the toolbar was forced to the left side in an attempt
to fix an RTL bug. This led to wrong positioning in LTR.
This is now fixed by using a dynamic "show" animation that takes into
consideration already set positions.

-The correct position of the toolbar wasn't recalculated on updates
for RTL. This is now fixed.

Bug:21455067
Change-Id: I0b31a8fd3c95549f5f10133a47a4d3ef27689010
2015-06-03 16:24:52 +01:00
Andres Morales
595bc35d70 am a2a73650: am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev
* commit 'a2a736500cfe12de2c9efbcb5b14854ab7183b82':
  [LockSettings] migrate patterns to be indexed at '1'
2015-06-03 02:22:53 +00:00
Andres Morales
8f589d01d1 Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev 2015-06-03 01:01:18 +00:00
Yohei Yukawa
92280cd309 Convert subtypes whose locale is "tl" to "fil".
On Android, "tl" is a historic hack for what should really
be "fil". Now that we properly support 3-letter language codes,
we should be using "fil" throughout. Given this historical usage,
IMEs that really want to support Tagalog (and not Filipino)
should use the ISO-639-3 code for Tagalog, which is "tgl".

For backward compatibility reasons, this CL uses the similar
approach to I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10.
InputMethodSubtype.getLocale() continues to return the "locale"
string parameter passed to the constructor as is, but in the
Android framework we do normalizations/conversions whenever
we need a valid ISO-639-3 code.

In I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10, we rely on the
conversion in the Locale constructor.  In this CL, we do replace
"tl" with "fil" by ourselves.

This CL also adds InputMethodSubtype#getLocaleObject() a hidden
API so that we can start relying on the Locale object at least
in the framework.

This CL is based on the investigation by Narayan Kamath and his
patch.

Bug: 20696126
Change-Id: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
2015-06-02 17:09:50 -07:00
Jorim Jaggi
8c98190898 am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev
* commit '311f8a7cb0196d3a49a0f600856671193974b5ed':
  Make sure starting windows only draw once
2015-06-02 22:49:00 +00:00
Andres Morales
e40bad8cf9 [LockSettings] migrate patterns to be indexed at '1'
Base zero patterns (ones where the top left is idx 0)
are not handled properly by scrypt. Add logic to re-enroll
base zero patterns such that the top left is idx 1.

Bug: 21433955
Change-Id: I7f67f2c67d40dd1be6c62117710dc3b0392275a2
2015-06-02 13:45:02 -07:00
Jorim Jaggi
a16cc15f6c Make sure starting windows only draw once
The panel menu was invalidated, and thus a runnable was posted for
the next frame, to update the panel menu, and invalidate the view. We
avoid this by not invalidating the panel menu for starting windows.

Bug: 20949632
Change-Id: I67ca47e3a7ce3ba1d685c2313efa66fb1cdee312
2015-06-02 18:35:56 +00:00
Ruben Brunk
8b2cf64630 am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
  Track camera and flashlight usage in battery stats.
2015-06-02 14:24:01 +00:00
Adrian Roos
97e5851aec am c474645a: am c45d6c30: Merge "Translucent bars in landscape" into mnc-dev
* commit 'c474645ab8555ce1226f5f72a8a9fafe18965bbf':
  Translucent bars in landscape
2015-06-02 14:22:20 +00:00
Adam Powell
a974b09c67 am ecb6be7d: am dc49d5f8: Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev
* commit 'ecb6be7d2889c2bb09179239817578fbb465bc99':
  Fix one-action choosers with EXTRA_INITIAL_INTENTS
2015-06-02 14:21:46 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Ruben Brunk
6d2c363fd5 Track camera and flashlight usage in battery stats.
Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
2015-06-01 16:54:23 -07:00
Adrian Roos
c45d6c30a5 Merge "Translucent bars in landscape" into mnc-dev 2015-06-01 23:25:35 +00:00
Abodunrinwa Toki
4af95ede5b am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev
* commit 'd9b7424923662e465fe2cf155cb7a9e6eef434c0':
  Fix FloatingToolbar look and animation for RTL.
2015-06-01 23:22:06 +00:00
Adrian Roos
8a8ffd4e9b Translucent bars in landscape
Bug: 18739556
Change-Id: Ib9602a9d1f09e6bd6c1306927990676120dff012
2015-06-01 15:42:26 -07:00
Adam Powell
dc49d5f8ae Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev 2015-06-01 22:37:38 +00:00
Abodunrinwa Toki
5047132887 Also refresh FloatingToolbar for "icon" menu item changes.
Bug: 21512730
Change-Id: I77f62c46e2d2a11e6cb4329fa8b659bb1a97a6b9
2015-06-01 23:03:34 +01:00
Abodunrinwa Toki
bdd500ecd4 Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 2015-06-01 21:31:20 +00:00
Jorim Jaggi
6c49882975 am c8d5901b: am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit 'c8d5901bc83814c0dab281fc108de643cdd7b09d':
  Cleanup Keyguard handling when turning off screen
2015-06-01 19:29:19 +00:00
Filip Gruszczynski
f02ace9b9b am 49895c6e: am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '49895c6eadcca35bfe4369b53c8fc2e13a603520':
  Dismiss or cancel in SwipeDismissLayout on screen off.
2015-06-01 19:29:14 +00:00
Jorim Jaggi
1e47a8e096 Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 2015-06-01 19:13:11 +00:00
Filip Gruszczynski
29c840ebb0 am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
  Dismiss or cancel in SwipeDismissLayout on screen off.
2015-06-01 19:09:57 +00:00
Filip Gruszczynski
11d50c9cc6 am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.
2015-06-01 18:57:21 +00:00
Filip Gruszczynski
183f8fa450 am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev
* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
2015-06-01 18:49:47 +00:00
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off.
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
2015-06-01 10:09:45 -07:00
Abodunrinwa Toki
6c5ac8e9e6 Fix FloatingToolbar look and animation for RTL.
- Fix positioning issues which causes the toolbar to appear cut
since it extends beyond its containing window.
- Fix the open/close overflow animations to open to left (instead
  or right) for RTL.

Bug: 21455067
Change-Id: I799b74c67c96b03bca4b2c9fbb6e1165b651ac7f
2015-06-01 17:35:34 +01:00
Jorim Jaggi
d175b6cfe0 Cleanup Keyguard handling when turning off screen
Before, Keyguard was shown whenever PhoneWindowManager went to sleep.
However, this was too early on some devices, and too late on others.
Now, the callbacks are split up into two phases: startedGoingToSleep
and finishedGoingToSleep. In the first callback, we decide what to
do and play the lock sound if necessary. In the second callback, we
actually show the Keyguard, or reset its state necessary, so it
doesn't interfere with the screen off animation.

Bug: 17929748
Bug: 20782303
Change-Id: I4c4406595b07b7589d64f380cd3fa96bed3d20ee
2015-05-30 00:41:07 +00:00