Commit Graph

697 Commits

Author SHA1 Message Date
Julia Reynolds
98aa59e407 Merge \\"Snooze schedule rules that were canceled by alarms.\\" into nyc-mr1-dev am: ae0aed951b
am: 261b655396

Change-Id: Icd0ff5a828d0f2a39bb0e39085cd9fd7788f354f
2016-07-20 20:51:12 +00:00
Julia Reynolds
261b655396 Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
am: ae0aed951b

Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
2016-07-20 20:45:13 +00:00
Julia Reynolds
fe58f1f386 Snooze schedule rules that were canceled by alarms.
So a reboot or snoozed alarm doesn't cause them to
reactivate.

Bug: 30087850
Change-Id: I83fdb88009b515d442993944aec40df7365e830f
2016-07-20 14:50:39 -04:00
Jason Monk
b55c3c60a8 Merge \\"QS: Don\\'t use ComponentName to identify tiles\\" into nyc-mr1-dev am: a0967ebbdf
am: 356d4914b2

Change-Id: I83fad6237edfb9516e1fe40612b820c319f26cc5
2016-07-15 20:16:44 +00:00
Jason Monk
356d4914b2 Merge \"QS: Don\'t use ComponentName to identify tiles\" into nyc-mr1-dev
am: a0967ebbdf

Change-Id: Ib98a48e46f711b927a1b9e8d2b8162a59bfa3240
2016-07-15 17:03:46 +00:00
Jason Monk
a0967ebbdf Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev 2016-07-15 16:55:23 +00:00
Julia Reynolds
62d1abf0bd Merge \\"Attribute manual zen mode in volume panel footer.\\" into nyc-mr1-dev am: f6d766020f
am: c2381727a7

Change-Id: Ibb38d3a68dd642b5d6507341b7e189b77bba9502
2016-07-13 15:41:55 +00:00
Julia Reynolds
c2381727a7 Merge \"Attribute manual zen mode in volume panel footer.\" into nyc-mr1-dev
am: f6d766020f

Change-Id: I89ee22c5304e7de651aa34bddf5635f2e87e6b01
2016-07-13 15:33:36 +00:00
Julia Reynolds
44ad6ff4c2 Attribute manual zen mode in volume panel footer.
So users know what app enabled DND.

Change-Id: I0aad862539b28302bf618641ad29cdfa956c8f33
Fixes: 29892371
2016-07-13 10:28:54 -04:00
Jason Monk
ee68fd889c QS: Don't use ComponentName to identify tiles
Evidently some apps redirect/obscure tiles in a way that makes
creating a ComponentName from the TileService useless.  Instead
generate a token which will be a much more stable way of identifying
tiles henceforth.

Change-Id: Id68550bcdcdc3e3987f09380f258610e7a5aca85
Fixes: 29121793
2016-06-30 14:49:50 -04:00
Jason Monk
099b337db9 Merge \\\"QS: Hacks to fix bigger problems in TileService binding\\\" into nyc-dev am: 1427bb3dc0 am: 955de27827
am: 1ae5fbb187

Change-Id: I07ea15c56048becb7cba5f27bb7037ae8e10aea2
2016-06-23 21:12:32 +00:00
Jason Monk
1ae5fbb187 Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0
am: 955de27827

Change-Id: I54da9edd0593160ee38002cb2d97c64248a9ed96
2016-06-23 21:07:50 +00:00
Jason Monk
9981d94d54 Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
am: 1427bb3dc0

Change-Id: I471055cbac21c09d23b60e6dab15bcc1cd1d6208
2016-06-23 21:02:13 +00:00
Jason Monk
955de27827 Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
am: 1427bb3dc0

Change-Id: I9b5e57c302b6ae0f6accccf65b5e404a1ad780c0
2016-06-23 21:00:19 +00:00
Jason Monk
6edbefdd54 QS: Hacks to fix bigger problems in TileService binding
Bug: 29121793
Change-Id: I9cb8d8ee36ce5cc77ba3c11decb1b3a797fd7999
2016-06-23 14:59:22 -04:00
Jason Monk
4519b87423 Merge \\\"QS Tiles: Fix some problems with connecting through intent\\\" into nyc-dev am: 126088536d am: a5076ef7fa
am: 8f21a99bfa

Change-Id: Idd0944573e8db2b282795952ceb35d2fe9961419
2016-06-22 17:18:52 +00:00
Jason Monk
8f21a99bfa Merge \\"QS Tiles: Fix some problems with connecting through intent\\" into nyc-dev am: 126088536d
am: a5076ef7fa

Change-Id: I9bb70bc724c36906e014d6f86e48efe37bb42001
2016-06-22 17:10:34 +00:00
Jason Monk
a5076ef7fa Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
am: 126088536d

Change-Id: I7e8ee5c59d7f26dcbc2406a53c0c6c39a9d8f55e
2016-06-22 16:54:06 +00:00
Jason Monk
d8aa42f3e2 Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
am: 126088536d

Change-Id: Ie187a5c2e062f9b51fd21e80e81cac15f02ccbe6
2016-06-22 16:53:58 +00:00
Jason Monk
8753e184f9 QS Tiles: Fix some problems with connecting through intent
- Don't send Tile through intent, it can cause crashes
 - Clean up other issues surrounding this

Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485
2016-06-22 10:52:58 -04:00
Jason Monk
fe5ff2279f Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am: fc70b07385

Change-Id: I7327f5e4f7ac2180e0c584dc761b861c14dd475f
2016-06-18 02:09:57 +00:00
Jason Monk
6831aee5fa Merge \\\"QS API: Fix mService and mTile being null once and for all\\\" into nyc-dev am: fc70b07385 am: c552a36992
am: 6a06372bb9

Change-Id: I8164179f96be4195bcafb3528e8dcbc45946bee2
2016-06-17 21:49:07 +00:00
Jason Monk
6a06372bb9 Merge \\"QS API: Fix mService and mTile being null once and for all\\" into nyc-dev am: fc70b07385
am: c552a36992

Change-Id: I7a0cc08bbad4ae7ccfd3344f3235ab88eddefab4
2016-06-17 18:50:05 +00:00
Jason Monk
c552a36992 Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am: fc70b07385

Change-Id: I2aed24cf36354fbe332787082bcf628357bab3b1
2016-06-17 18:45:04 +00:00
Jason Monk
a3453b8bd9 QS API: Fix mService and mTile being null once and for all
Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes: 29121793
2016-06-17 13:04:05 -04:00
Jorim Jaggi
f5e5c3a72a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev am: c27660d45a
am: acfed07f72

* commit 'acfed07f725466e866445cfdf4fda94fa0e8f0a0':
  Add new attributes for wallpaper info

Change-Id: Ie439547cb6964c1f90b2ac313408a502027ccd25
2016-06-04 00:41:07 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
2016-06-04 00:27:04 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
Svetoslav Ganov
0649158cad Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff am: 13f802dc01
am: a8cdb6f645

* commit 'a8cdb6f6453d23f915d5c470bbdf1000153df383':
  Properly set default voice interactor

Change-Id: I6310a3da7aeb0b8b78918399ef79a0fcc91d4792
2016-06-02 22:52:13 +00:00
Svetoslav Ganov
a8cdb6f645 Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff
am: 13f802dc01

* commit '13f802dc013866986be51328af21378783d19e61':
  Properly set default voice interactor

Change-Id: I29c2a1490877d4b25ca64fee8a53c6970d07a1f2
2016-06-02 22:47:29 +00:00
Svetoslav Ganov
bd28e027ed Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
2016-06-02 22:47:26 +00:00
Svetoslav Ganov
13f802dc01 Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
2016-06-02 22:43:41 +00:00
Svetoslav Ganov
b625e19a87 Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.

bug:28963642

Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
2016-06-02 15:25:15 -07:00
Ji Yang
811d0411f3 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d
am: 54b280ba66

* commit '54b280ba66d8f92d73711df4d02add1140eb416f':
  Rename carrier messaging API constant.

Change-Id: Ib94ec913651d3b0c92e43927cb8a091732319777
2016-05-26 16:31:58 +00:00
Ji Yang
54b280ba66 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff
am: e6c6ca417d

* commit 'e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
  Rename carrier messaging API constant.

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a
2016-05-26 16:12:55 +00:00
Ji Yang
e6c6ca417d Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
2016-05-26 15:54:38 +00:00
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
2016-05-26 15:54:27 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
TreeHugger Robot
e1b53d7cab Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Julia Reynolds
88be37e50a Merge changes from topic \'cps\' into nyc-dev am: d3827be162
am: 5bf51f026c

* commit '5bf51f026cddca00b156f93089cb803e4c612d96':
  Api updates.
  Note timezone changes.

Change-Id: Ic175b68e0c8000c1fe613f0e213631d7e1275f2d
2016-05-25 17:21:58 +00:00
Julia Reynolds
39c013811e Merge changes from topic \'cps\' into nyc-dev
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: I52055d3a5193bed6392327bd5df82dc7880c5ce7
2016-05-25 17:16:01 +00:00
Julia Reynolds
5bf51f026c Merge changes from topic \'cps\' into nyc-dev
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
2016-05-25 17:15:07 +00:00
Julia Reynolds
ad41a6f0de Api updates.
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
2016-05-25 13:02:50 -04:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Chris Wren
99eed4b5d6 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112
am: ec2e36a485

* commit 'ec2e36a4851780219e342c545467fb433ef16fd6':
  Don't throw RemoteException from new NLS APIs

Change-Id: If4175e64a71b2b02306f9eb579f9755492ea6dfd
2016-05-23 19:07:27 +00:00
Chris Wren
ec2e36a485 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
2016-05-23 19:01:27 +00:00
Chris Wren
4da0296e23 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: Ibafc3d9adeb046b2b43593285b6f605693b8682e
2016-05-23 19:01:21 +00:00
Meng Wang
fe9ed66227 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev
am: ac517216c5

* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
2016-05-20 22:21:26 +00:00
Meng Wang
64997623bf Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Also:
   Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
2016-05-20 13:18:41 -07:00
Chris Wren
cf548bfad6 Don't throw RemoteException from new NLS APIs
Bug: 28820058
Change-Id: If4a290ab7549aa999cee348bf0db85b70cb57553
2016-05-20 14:53:16 -04:00