Commit Graph

46721 Commits

Author SHA1 Message Date
Doris Liu
02ecf04097 Merge "Distance based animation duration" 2015-04-10 21:47:25 +00:00
Adam Lesinski
eaa6a3fba8 Merge "Fix deadlock issue in BatteryStatsHelper." 2015-04-10 21:33:50 +00:00
Doris Liu
0084e37095 Distance based animation duration
In order to preserve the same look and feel of an animation across different
devices, we need to maintain the same angular velocity for the animation in
users' field of view. Since the animation path may span different angles on
different devices, we need to therefore adjust the duration accordingly.

Change-Id: Ia37f213e5a894a046edbb1a45a4ced04e406d85d
2015-04-10 14:09:30 -07:00
ztenghui
4e1e6af476 Merge "The ValueAnimator's state need to be totally reset during clone." 2015-04-10 20:49:00 +00:00
ztenghui
26e9a19900 The ValueAnimator's state need to be totally reset during clone.
b/20119270

Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
2015-04-10 13:33:13 -07:00
Adam Lesinski
1739076ef9 Fix deadlock issue in BatteryStatsHelper.
It was assumed that BatteryStatsHelper could safely call into system services.
Because it is used when dumping information from the BatteryStatsService,
this assumption was incorrect.

Now the BatteryStats object carries around the state of the energy reporting
for Bluetooth and WiFi, so BatteryStatsHelper avoids a query into WiFiManager.

b/19729960

Change-Id: I8745cf6aafeea8e862e34fe63b20056f6ba54b40
2015-04-10 13:17:47 -07:00
Chirag Shah
77d11ed69e Merge "Add support for schema.org actions in the assist data bundle." 2015-04-10 20:13:56 +00:00
Alan Viverette
682a433d0b Fix application of default dialog theme
Cleans up lint annotations.

Bug: 20149703
Change-Id: I2ed4eb002b6679a55ea4d5fcc1ea958a4dcb08df
2015-04-10 12:42:57 -07:00
Ashutosh Joshi
c5d8d88b12 Merge "Adding a feature string for high capability sensors." 2015-04-10 18:36:43 +00:00
Alex Klyubin
75f6f31db4 am d31d4771: am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h"
* commit 'd31d4771d90277eb246814b6a6f981e0842eb614':
  Track more changes to keymaster_defs.h
2015-04-10 18:29:53 +00:00
Alex Klyubin
c5f9683c06 am a270264c: Merge "Track more changes to keymaster_defs.h"
* commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
  Track more changes to keymaster_defs.h
2015-04-10 18:09:27 +00:00
Scott Kennedy
e7b03631d2 Fix a typo in BluetoothLeScanner documentation
Change-Id: Id19dae9a583c0ef621789604277e3f6c6aead80c
2015-04-10 10:25:34 -07:00
Clara Bayarri
94bf0d9157 Merge "Editor: Account for a split cursor in the content rect calculation" 2015-04-10 17:22:42 +00:00
Doris Liu
fe928dac69 Merge "Add a check for color type in property values holder" 2015-04-10 17:19:43 +00:00
Craig Lafayette
2a91bbfb4d Merge "Reset protection in PersistentDataBlockManager" 2015-04-10 17:15:49 +00:00
Craig Lafayette
66445a639d Reset protection in PersistentDataBlockManager
Add method to allow authorized data block wipe in support of factory
reset protection. This will allow ManagedProvisioning to respond to
and pass factory reset protection challenges during automated device
setup.
- Adds the wipeIfAllowed method to clear the data block
- Creates a protected-broadcast to send to allowed package

Bug: 19792435
Change-Id: I897f2ea2afb1222a1fc8ac49290ee45ea4d3f2d7
2015-04-10 13:14:24 -04:00
Ashutosh Joshi
eae371bf6f Adding a feature string for high capability sensors.
Adding a feature string for higher capability sensor platforms.
The string is supposed to signal the availability of lower power and
higher accuracy sensor processing on a supporting device.

Change-Id: I8093065278589fc9cc41fcc7f9b898c7eae20dff
2015-04-10 09:33:16 -07:00
Alex Klyubin
55f7c2770f Track more changes to keymaster_defs.h
KeyStoreTest needed to be adjusted because OCB is no longer supported.

Bug: 18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
2015-04-10 08:58:38 -07:00
Clara Bayarri
b7419dd76e Editor: Account for a split cursor in the content rect calculation
In some cases, the cursor in a TextView is split. This happens with
RTL languages. For this case we need to ensure neither of the half
cursors is obscured by the Floating Toolbar, hence we take the
minimal rectangle that contains both cursors as the content rect.

Change-Id: I2ce411793fcba2140c4ad7fb7caaf03593620484
2015-04-10 15:45:07 +01:00
George Mount
44220d7d9a Merge "Revert "Revert "Allow delay of showing/hiding shared element when transferring.""" 2015-04-10 14:25:37 +00:00
John Spurlock
1d7d2248ec Zen: New option to allow repeat callers.
Bug: 20064962
Change-Id: I11a5519c02bf8fa8e332559092c865c5e612fbd2
2015-04-10 09:21:08 -04:00
Clara Bayarri
4c42bc045d Merge "Editor: Allow invalidation of the Text Selection Action Mode" 2015-04-10 10:02:21 +00:00
Narayan Kamath
7f062245f6 Create DropboxService lazily.
We seldom use it from libcore.io.DropBox so there's not much point
(there's only one usage, from a conscrypt SSL error). This saves > 10ms
from ActivityThread.attach.

Change-Id: I360158ef9a36a9ababd700e4f3243c92b74047eb
2015-04-10 08:20:45 +00:00
Seigo Nonaka
f2b233d44c Introduce Ctrl+Backspace/Ctrl+ForwardDelete shortcut.
Ctrl+Backspace deletes preceding one word and Ctrl+ForwardDelete delets
following one word.
Used Chrome's implementation/behvior as a reference.

Bug: 17810742
Change-Id: I7b2ca515b2f017e457f7104ec7b8e7473ca4e081
2015-04-10 15:18:10 +09:00
Pirama Arumuga Nainar
d119e52050 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-04-10 04:37:01 +00:00
Seigo Nonaka
7bfcad3427 Merge "Fix unexpected selection cancellation" 2015-04-10 04:35:38 +00:00
Alex Klyubin
8d33804b01 am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '037dfb9423a0988398b67520546dae5673aa54bb':
  Track recent keymaster_defs.h changes.
2015-04-10 04:34:13 +00:00
Seigo Nonaka
7f9be1cbfa Merge "Use TextView's text locale for capitalization." 2015-04-10 03:35:32 +00:00
Jeff Brown
cb0392fa1c Merge "Expose Cursor.setExtras()." 2015-04-10 03:11:44 +00:00
Doris Liu
9032fa5808 Add a check for color type in property values holder
Bug: 20140483
Change-Id: Ic6cc72388811a450e29a346625c785456834452b
2015-04-09 20:11:22 -07:00
Jeff Brown
b77640533f Merge "Clean up AbstractCursor API." 2015-04-10 02:50:08 +00:00
Jeff Brown
004a170458 Merge "Remove deprecated fields in AbstractCursor." 2015-04-10 02:49:36 +00:00
Jeff Brown
4e0951ef7a Expose Cursor.setExtras().
Bug: 19369537
Change-Id: I78e319667cbfaeb51f471d18c4fefeac01d49d80
2015-04-09 19:48:11 -07:00
Jeff Brown
8faab36fdd Clean up AbstractCursor API.
Deprecated three protected fields that should not have been
exposed in the API.

Bug: 6353797
Change-Id: Ic6710f880a452dd1508abf0613907a1d2b1fb557
2015-04-09 19:48:10 -07:00
Jeff Brown
4670513e70 Remove deprecated fields in AbstractCursor.
Bug: 6353797
Change-Id: Ibf760f0aeef82c176e3c659a2ced3de07f8e8abe
2015-04-09 19:48:10 -07:00
John Spurlock
ec88e8956c Merge "An update on Downtime." 2015-04-10 01:48:06 +00:00
John Spurlock
b2278d6571 An update on Downtime.
The update is that Downtime is obsolete.  Replaced by the
ability to define multiple named schedule calendars.

 - Make changes to ZenModeConfig to properly model manual
   and automatic rules.
 - Refactor the zen mode helper (and supporting classes) to
   properly handle / report multiple claims on zen mode.
   The "manual" rule (specified by the user in the UI) vs
   one or more automatic rules.
 - Automatic rules are still backed by condition providers,
   but the layering is now cleaner.  ConditionProviders is now
   completely generic, has no ties to zen mode.
 - Specifically, the new layering for zen mode (below noman) is:
   ZenModeHelper: Source of truth for zen state
     ZenModeFiltering: Subhelper dedicated to filtering rules.
     ZenModeConditions: Subhelper dedicated to managing automatic rules.
       ConditionProviders:  Underlying engine for reporting named boolean state.
 - Migration story for users with existing downtime config, migrated
   to a single new calendar named downtime.
 - For users with no existing downtime, two default calendars are created
   for weeknights + weekends (icu4j for all locales will be done in a followup).
 - Remove obsolete DowntimeConditionProvider/NextAlarmConditionProvider and tracking.
 - Clean up obsolete resources.
 - Add common zen summary description string computation.
 - Add proper noman wrappers for the new model.
 - Change the semantics of the global zen setting.  It is now read-only.  Setters
   must call noman, added a "reason" to all calls for better attribution.
 - Update zenmodepanel + volumedialog to the new model.
 - Display the one or more automatic rules in the new zen footer summary.
 - "Snooze" the automatic rules when the user explicitly turns zen off.

Bug: 20064962
Change-Id: Idd9deb865a6035ad0cfae660198dccb517e6d7cc
2015-04-09 21:45:08 -04:00
Alex Klyubin
5f8c17b9f6 am ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
  Track recent keymaster_defs.h changes.
2015-04-10 00:22:45 +00:00
Alex Klyubin
862e6c7814 Track recent keymaster_defs.h changes.
Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
2015-04-09 16:58:58 -07:00
Alan Viverette
0680bcd1f9 Merge "Avoid double-apply of dialog theme" 2015-04-09 23:52:41 +00:00
Fabrice Di Meglio
5f76360ff9 Merge "Add IntentFilter auto verification - part 5" 2015-04-09 23:23:38 +00:00
Fabrice Di Meglio
e48c137acd Add IntentFilter auto verification - part 5
- optimize IntentFilter verification: dont do stuff we dont want
if we dont need to do them.

- improve IntentFilter candidates filtering and also improve
at the same time fix for bug #20128771: we can return the candidates
list rigth the way if the Intent is not related to a Web data URI and
include the "undefined verification state" ones if the first filtering
pass does not leave any.

Change-Id: I19f5c060f58b93530e37b4425d19ed23d2a0f4c0
2015-04-09 16:19:44 -07:00
Dianne Hackborn
24f683523e Merge "More work on device idle mode and other power stuff." 2015-04-09 22:35:36 +00:00
George Mount
4dc668cd36 Revert "Revert "Allow delay of showing/hiding shared element when transferring.""
This reverts commit 44d15f1c2e.

Fix doc comment errors.

Change-Id: Ieeb07b907f0c66a133ef57136c45c504bcc04694
2015-04-09 15:31:38 -07:00
Clara Bayarri
32b7f9fbcc Merge "Editor: Turn on Floating Toolbar Action Mode for Text Selection" 2015-04-09 21:31:51 +00:00
Dianne Hackborn
4870e9d5eb More work on device idle mode and other power stuff.
Add idle mode support to the alarm manager.  Introduce
a new concept of flags associated with alarms to tell
the alarm manager how to treat the alarm -- they allow
everything from the alarm that will bring us out of idle
mode, to alarms that are allowed when idle or should
also bring us out of idle.  The standalone boolean is
now also a flag.

(Note there is currently no protection from user space
setting the flags however it wants; I will be working
on that in a follow-up change.)

When in idle mode, the alarm manager pushes all alarms
that shouldn't execute during that time over to a
separate list that is not executed until out of idle.
To help with this, I reworked a bit how Alarm objects
are managed, so that when rebatching or moving between
lists we don't have to allocated new objects but can
just use the same existing instance.

Also tweaked the sync manager to deal with idle mode,
which currently just means doing the same thing as when
low on storage -- turning off sync.

Add new ACTION_CHARGING and ACTION_DISCHARGING broadcasts
that apps can listen for to know when the device is actively
charging and discharging.  These are better than the old
POWER_CONNECTED and POWER_DISCONNECTED ones because we only
report charging when we actually see that there is enough
power being provided to charge the battery (and will report
discharging if there is not enough power).

The job controller uses these new actions for scheduling
jobs that want to run while plugged in.  Removed the
"stable charging" stuff while doing so, since the new
charging state serves as an even better signal for that.

Introduced two new process states: FOREGROUND_SERVICE and
TOP_SLEEPING.  This will allow us to treat foreground services
specially (such as still allowing network access to them for
background music playback) while not mixing them together with
whatever happens to be the top activity while the device is
asleep.

Also some other small cleanup here and there.

Change-Id: I7a9808b578bad6f50deb8e1baf919298512a0d3a
2015-04-09 14:05:17 -07:00
Chet Haase
6498506330 Merge "Fix breakage from ActionBar animations" 2015-04-09 20:38:07 +00:00
Christopher Tate
f4ab2b1074 Merge "Add system API for querying the available restore dataset for a package" 2015-04-09 20:20:31 +00:00
Christopher Tate
511d02fcc3 Add system API for querying the available restore dataset for a package
Bug 20123585

Change-Id: Ife6e77a224b5d4175178aacdb7c285e9944b9eab
2015-04-09 13:13:42 -07:00
Chet Haase
1ae7c28440 Fix breakage from ActionBar animations
Real fix will come later, but this disables the animations to work
around the current crash.

Issue #20125407 Settings Crashes when changing orientation of device

Change-Id: I748e8889f72483c82cff084c5815322057f16f03
2015-04-09 11:42:30 -07:00