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

22801 Commits

Author SHA1 Message Date
Svetoslav Ganov
668661452b Merge "Fix a regression in SettingsProvider" into nyc-dev 
am: e7f82ec533

* commit 'e7f82ec533b2d768f0f5c2249947d228059565d9':
  Fix a regression in SettingsProvider
 2016-03-02 21:45:59 +00:00
Ido Ofir
379db962ef Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev 
am: 51e06e011d

* commit '51e06e011d3694d410718dafe15341f8bd9cd392':
  checking additional metadata and completed categories before displaying suggested actions in settings.
 2016-03-02 21:43:58 +00:00
Jason Monk
58add15bb3 Merge "Guard against battery tile crash" into nyc-dev 
am: f2bf0c4ba0

* commit 'f2bf0c4ba0a759b05a78ace4cb95c484a050aafe':
  Guard against battery tile crash
 2016-03-02 21:39:38 +00:00
Jason Monk
61964371d9 Merge "Fix crash while editing QS" into nyc-dev 
am: 25b86cca0f

* commit '25b86cca0f97b644379a311769632ebb18c6f8fe':
  Fix crash while editing QS
 2016-03-02 21:37:27 +00:00
Svetoslav Ganov
e7f82ec533 Merge "Fix a regression in SettingsProvider" into nyc-dev 2016-03-02 21:32:05 +00:00
Ido Ofir
51e06e011d Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev 2016-03-02 21:30:36 +00:00
Svetoslav Ganov
67a8d3516c Fix a regression in SettingsProvider 
bug24990012

Change-Id: I1631d125df029f559ffc059ffcb73067389184e8
 2016-03-02 13:26:43 -08:00
Jason Monk
f2bf0c4ba0 Merge "Guard against battery tile crash" into nyc-dev 2016-03-02 21:08:12 +00:00
Jason Monk
2462a50e8f Guard against battery tile crash 
Bug: 27419759
Change-Id: Ic152ab56f7648e7346cbddf21840bd5313e50d3c
 2016-03-02 16:04:39 -05:00
Julia Reynolds
387ede7593 Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev 
am: c523dc1ff9

* commit 'c523dc1ff9454bd8cd8fc9b00c39ea02409f93c4':
  Allow notifications to be hidden from lockscreen at a package level.
 2016-03-02 20:36:21 +00:00
Jason Monk
25b86cca0f Merge "Fix crash while editing QS" into nyc-dev 2016-03-02 20:31:14 +00:00
Jason Monk
88b31490b7 Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev 
am: 797b1ef39e

* commit '797b1ef39ea4ddd7341483ee70a4d0c08d8d1f1f':
  Shrink button ripple on QS btns to 36dp
 2016-03-02 20:29:15 +00:00
Jason Monk
b01da9e4a2 Fix crash while editing QS 
Bug: 27061859
Change-Id: I758bb6b881eadddca1a2e4eaae7b24319e512d14
 2016-03-02 15:28:30 -05:00
Julia Reynolds
c523dc1ff9 Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev 2016-03-02 20:15:54 +00:00
Julia Reynolds
26fa8a54b6 Allow notifications to be hidden from lockscreen at a package level. 
Bug: 26642033
Change-Id: I67674ea9d42ee6b5865702be5d9ab2b09b53e15f
 2016-03-02 15:13:54 -05:00
Steve McKay
a1bdc55eb6 Merge "Don\'t show title in delete confirmation." into nyc-dev 
am: 8db100e4a3

* commit '8db100e4a3283d05fed2ff00b2931e073261487a':
  Don't show title in delete confirmation.
 2016-03-02 20:09:30 +00:00
Jason Monk
797b1ef39e Merge "Shrink button ripple on QS btns to 36dp" into nyc-dev 2016-03-02 20:07:34 +00:00
Jason Monk
15e637dafd Merge "Add edit title to QS edit" into nyc-dev 
am: 4cabb1b91f

* commit '4cabb1b91fb32c8e07ce2649b2090518b6d2c7b9':
  Add edit title to QS edit
 2016-03-02 20:07:20 +00:00
Jason Monk
a2549ca8dd Merge "Guard against monkey crash" into nyc-dev 
am: c04cf4baec

* commit 'c04cf4baecfdfeaf82c8498203779d594c9b52a4':
  Guard against monkey crash
 2016-03-02 20:05:15 +00:00
Steve McKay
8db100e4a3 Merge "Don't show title in delete confirmation." into nyc-dev 2016-03-02 19:56:21 +00:00
Jason Monk
30014c4a57 Shrink button ripple on QS btns to 36dp 
Bug: 27388390
Change-Id: I1efbedfdf720edf4cf5d43797da59904d91cb543
 2016-03-02 14:52:27 -05:00
Jason Monk
4cabb1b91f Merge "Add edit title to QS edit" into nyc-dev 2016-03-02 19:48:25 +00:00
Jason Monk
c04cf4baec Merge "Guard against monkey crash" into nyc-dev 2016-03-02 19:48:01 +00:00
Ben Kwa
fed032e1a8 Merge "Tweak root item layouts." into nyc-dev 
am: f8d6fa2c5a

* commit 'f8d6fa2c5a42b9adaa7a745bc9c9feaeb3800cc3':
  Tweak root item layouts.
 2016-03-02 19:45:05 +00:00
Ben Kwa
f8d6fa2c5a Merge "Tweak root item layouts." into nyc-dev 2016-03-02 19:39:06 +00:00
Jason Monk
ae5bd03831 Guard against monkey crash 
Bug: 27448755
Change-Id: I8345a274c979bf8ca1b4041c14318dd73810f79a
 2016-03-02 14:38:31 -05:00
Jason Monk
f923db5623 Add edit title to QS edit 
Bug: 27439419
Change-Id: I3807dc56a05b1ffafcd9b390dfdbc1da9a7ebcac
 2016-03-02 14:11:14 -05:00
Steve McKay
1788dfd223 Merge "Always show intern storage." into nyc-dev 
am: b4672ef6df

* commit 'b4672ef6dfbaf416981539d515ad1489d7d0bc87':
  Always show intern storage.
 2016-03-02 19:02:19 +00:00
Steve McKay
b4672ef6df Merge "Always show intern storage." into nyc-dev 2016-03-02 18:49:28 +00:00
Steve McKay
7c4395804e Always show intern storage. 
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".

Bug: 27297398

Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
 2016-03-02 10:47:59 -08:00
Jaewan Kim
008d56918b Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev 
am: 19d7eeaedf

* commit '19d7eeaedf4c80ae1d191f201ab028adc88ac2cb':
  PIP: Show recents again when PIP menu is closed
 2016-03-02 18:46:55 +00:00
Chong Zhang
20862420c2 Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev 
am: 5d9de3ab6f

* commit '5d9de3ab6f768c9b9d5c4fa627ce019f74370531':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 18:42:42 +00:00
Dongwon Kang
19d7eeaedf Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev 2016-03-02 18:34:10 +00:00
Chong Zhang
5d9de3ab6f Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev 2016-03-02 18:30:00 +00:00
Chris Wren
8b6e1c888b Merge "add all those great comments from the other file" into nyc-dev 
am: e83cd6147b

* commit 'e83cd6147be45afd57722e414239d2dd15e257c0':
  add all those great comments from the other file
 2016-03-02 18:03:08 +00:00
Ido Ofir
d193c6729f checking additional metadata and completed categories before displaying 
suggested actions in settings.

Bug: 27271616
Change-Id: I855bc03337b04c5ff685c102f44dfc0d6638592b
 2016-03-02 09:58:59 -08:00
Jason Monk
49f68ab466 Merge "Fix crash from battery detail" into nyc-dev 
am: 8326e38bf5

* commit '8326e38bf51de2771dab65baee9a97fb6ae7ff1d':
  Fix crash from battery detail
 2016-03-02 17:51:51 +00:00
Chris Wren
e83cd6147b Merge "add all those great comments from the other file" into nyc-dev 2016-03-02 17:51:29 +00:00
Jaewan Kim
3ebc1e3f99 PIP: Show recents again when PIP menu is closed 
Framework enforces that an app cannot go back to Recents.
So launches the Recents again for the PIP menu.

Change-Id: I7526edfe7dd38c7eb1befe6a8b2b5f4ea30aa84e
 2016-03-02 09:51:07 -08:00
Jason Monk
8326e38bf5 Merge "Fix crash from battery detail" into nyc-dev 2016-03-02 17:42:27 +00:00
Jason Monk
6cb901268e Fix crash from battery detail 
Bug: 27417780
Change-Id: Ia63dd78a4b7b75470b57c8262bbc836180274bf5
 2016-03-02 12:40:43 -05:00
Geoff Mendal
a793284540 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 16:38:50 +00:00
Geoff Mendal
48a4eb1f81 Import translations. DO NOT MERGE 
Change-Id: I0b50c9fa731657538936e961e3c0fa1eaa594489
Auto-generated-cl: translation import
 2016-03-02 07:30:42 -08:00
Geoff Mendal
cc3cae5edf Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:26:07 +00:00
Geoff Mendal
6c9af03fce Import translations. DO NOT MERGE 
Change-Id: I5f64277ff355790a3babb97dfeb37ecc892dfa71
Auto-generated-cl: translation import
 2016-03-02 07:25:28 -08:00
Geoff Mendal
840d8f1446 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:22:28 +00:00
Geoff Mendal
1ddc11be55 Import translations. DO NOT MERGE 
Change-Id: Id4836eb0d7454cbb028a40032ecd229e4a4d90d3
Auto-generated-cl: translation import
 2016-03-02 07:20:37 -08:00
Geoff Mendal
a302da37a7 Import translations. DO NOT MERGE 
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
 2016-03-02 07:14:03 -08:00
Tomasz Mikolajewski
d191d076b8 Merge "Fix DocumentUI\'s perf tests compile failure." into nyc-dev 
am: 0d26fdb6cd

* commit '0d26fdb6cd3c4637ec2c4db7467c739991285a0b':
  Fix DocumentUI's perf tests compile failure.
 2016-03-02 09:17:10 +00:00
Tomasz Mikolajewski
0d26fdb6cd Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev 2016-03-02 09:00:48 +00:00