Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
30e434a996 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 2016-06-02 21:05:56 +00:00
Chris Wren
6343cb5acd resolve merge conflicts of 18455a9 to master 
Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e
 2016-06-02 17:04:35 -04:00
Chris Tate
29f4289ae2 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077 
am: 0cd6ca14eb

* commit '0cd6ca14eb8fbfbca9602067c93a4c6bd619ddbe':

Change-Id: I7004432a892427f5445b9a8716843e4fd8ba5e49
 2016-06-02 21:02:05 +00:00
Makoto Onuki
51ab2b3fd0 ShortcutManager: Break down unit tests 
The test file is getting too big and making the IDE very slow.
Now it's split into multiple files

Change-Id: I50ed89f19defd3809f327bc21e7d9ea790dcde4e
 2016-06-02 14:00:34 -07:00
Chong Zhang
b1e24209f1 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev 2016-06-02 20:58:06 +00:00
Chris Tate
4169184518 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077 
am: 4872e3df96

* commit '4872e3df962a386576b51e03a26add0ceb700698':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Idabd2988d6b63e06a018c24c1b3a9e17514596b3
 2016-06-02 20:55:53 +00:00
Christopher Tate
0cd6ca14eb Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev 
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia950b6992e76d05bccd5773cdda04308ddb054c0
 2016-06-02 20:55:28 +00:00
Philip P. Moltmann
cd7b1b7cdf Do not rotate PDFPrinter pages. 
- applyPrintAttributes is only used by PDFPrinter

Fixes: 29057330
Change-Id: I883cc64039f4ca2c93810e99d758f2dceec67a8b
 2016-06-02 20:53:53 +00:00
Christopher Tate
4872e3df96 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev 
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia04215f6597dc3221bda438feb4921d53c1725fc
 2016-06-02 20:49:27 +00:00
TreeHugger Robot
91b43d50fd Merge "sysui: refactor for extensibility." 2016-06-02 20:49:08 +00:00
Chris Tate
453951d077 Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev 2016-06-02 20:45:16 +00:00
Makoto Onuki
b58e350e92 Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev 
am: a9f262d649

* commit 'a9f262d649fd1b3b1980a564facc4f1388c541be':
  ShortcutManager: Implement max # of shortcuts

Change-Id: I6105a20eb6d8f3840e826ec91bc8db68fdc33e44
 2016-06-02 20:43:37 +00:00
Makoto Onuki
a9f262d649 Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev 2016-06-02 20:38:15 +00:00
Chris Wren
18455a9108 Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev 
am: cf665232f3

* commit 'cf665232f332faa4d3c0c6247c6e5685684a1b2a':
  Give the auto-merger somthing to hang on to.

Change-Id: I7ee4ae7df89504ab53eb2829ca90243baa2aef65
 2016-06-02 20:35:27 +00:00
Chong Zhang
6725472329 Fix scroll amount calculation in ViewRootImpl 
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.

It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.

bug: 29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
 2016-06-02 13:33:40 -07:00
Chris Wren
cf665232f3 Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev 2016-06-02 20:28:31 +00:00
Adrian Roos
237ffa48d0 Fix BigText transitions 
Fixes a bug where BigText would never transition
between the expanded and collapsed version because
padding was wrongly taken into account when checking
the view height.

Change-Id: I4df242b4133dacdff77b78cc2d4ff3954b75b8a7
Fixes: 29042222
 2016-06-02 13:16:30 -07:00
Billy Lamberta
9fec73a47c docs: work minisite post-launch fixes 
* Localization for table of contents.

* Replace occurrences of 'app restrictions' with the preferred
term 'managed configurations' (see go/afw-words). Update resource
card titles and add page redirects.

* In guide, update language for SSO with Chrome Custom Tabs.
(Cherry-picked from 1056063.)

* Add resource card for 'Your Apps at Work' video.

bug: 28378252, 27744376
Change-Id: I8bc2e87d0486159bdd6680600b783af7334c3a58
 2016-06-02 13:04:57 -07:00
Roozbeh Pournader
36cd87d04e Unhide CharSequence APIs to BidiFormatter 
The APIs are useful in avoiding the unnecessary creation of strings
when you have a CharSequence that's not a String.

Bug: 26979409
Change-Id: I27cd157ca53edb5f44a1e69085a1882af3cc7c6a
 2016-06-02 13:01:19 -07:00
Jorim Jaggi
c67062523a Merge "Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 93ef31f1ca" into nyc-mr1-dev-plus-aosp 
am: 036f8ac188

* commit '036f8ac188249586b265c08f31f8d22bb6449e3f':

Change-Id: I2b63c7228247ee76b7832005771fc4bc853f08e1
 2016-06-02 19:58:55 +00:00
Jorim Jaggi
199fec8a34 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 8524697351 
am: 6379e87d06

* commit '6379e87d06ccf741b0328bed57b67b1b52fa66cc':
  Also update setMinLines

Change-Id: Ibe15ee4c83b5e51a71e49179d4428f28e2e89725
 2016-06-02 19:58:51 +00:00
Julia Reynolds
67d5aa99a5 Merge "Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: db3744969e" into nyc-mr1-dev-plus-aosp 
am: 754ac1b4dd

* commit '754ac1b4ddd224fc66f0feaf0c711eb7f7e5b83b':

Change-Id: I76be44aee6148c7e0dd50524df3a4a7ea38f3b24
 2016-06-02 19:53:08 +00:00
Android Build Merger (Role)
036f8ac188 Merge "Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb am: 93ef31f1ca" into nyc-mr1-dev-plus-aosp 2016-06-02 19:53:07 +00:00
Julia Reynolds
7b728243ff Merge "Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 48347048ba" into nyc-mr1-dev-plus-aosp 
am: cd188b6a6f

* commit 'cd188b6a6f9c94881b2de131f1a28143a83baaae':

Change-Id: I867d069877dbda3f022c2575adbfb7624ffbebdf
 2016-06-02 19:52:59 +00:00
Julia Reynolds
72735de3db Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: f584b1d96d 
am: 98d4456187

* commit '98d44561879bdc0c92ea03ce71a358217e43e377':
  Fix leak on density change.

Change-Id: Ic727a3c28d6e965bb0a79e667a6487f40aafc28f
 2016-06-02 19:52:43 +00:00
Jorim Jaggi
b874a7e4b7 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb 
am: 93ef31f1ca

* commit '93ef31f1ca85cea95457af3eb6b9dc0bdbb0f9fd':
  Also update setMinLines

Change-Id: Ib75ddd419cbbbd2eebfbd434e294b474fde3e76c
 2016-06-02 19:52:28 +00:00
Julia Reynolds
555069f5ef Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 9548013287 
am: 30721fb490

* commit '30721fb4905a5743896134274ee83766c2dcc363':
  Hide alarm condition if there's no alarm.

Change-Id: Ib5584c9bdc2648ea69917511b7cdc4b9e455f7da
 2016-06-02 19:52:23 +00:00
Jorim Jaggi
6379e87d06 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb 
am: 8524697351

* commit '8524697351bb034c56bce99b6503225ca121fc71':
  Also update setMinLines

Change-Id: I0dff24ca60c040bc003ccae9b0111a1e437ce255
 2016-06-02 19:52:09 +00:00
Jorim Jaggi
93ef31f1ca Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb
 2016-06-02 19:45:17 +00:00
Jorim Jaggi
8524697351 Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
 2016-06-02 19:45:09 +00:00
Jason Monk
7de67877cd Merge "QS: Only put visible tiles in listening state" 2016-06-02 19:44:18 +00:00
Android Build Merger (Role)
754ac1b4dd Merge "Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb am: db3744969e" into nyc-mr1-dev-plus-aosp 2016-06-02 19:40:49 +00:00
Android Build Merger (Role)
cd188b6a6f Merge "Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 am: 48347048ba" into nyc-mr1-dev-plus-aosp 2016-06-02 19:40:34 +00:00
Julia Reynolds
f46fcae32a Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb 
am: db3744969e

* commit 'db3744969e241276ff02c58f9fefc8efb85c2c7d':
  Fix leak on density change.

Change-Id: I0c2cdc6d46a14c4788405cb3f9f7af09eeed85ea
 2016-06-02 19:39:56 +00:00
Julia Reynolds
061fb40231 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 
am: 48347048ba

* commit '48347048bade66799525391ca3bcfb42f95243a7':
  Hide alarm condition if there's no alarm.

Change-Id: I5613d6377b97aa35c6427730da8df643780017f5
 2016-06-02 19:39:30 +00:00
Julia Reynolds
98d4456187 Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb 
am: f584b1d96d

* commit 'f584b1d96d2d114d57f5c87e9c517b7929854d53':
  Fix leak on density change.

Change-Id: I268a0c2d4096ad7d28c31964c560da88be43b44a
 2016-06-02 19:39:14 +00:00
Julia Reynolds
30721fb490 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 
am: 9548013287

* commit '9548013287f8345177e106cb79bc8c6d621457bd':
  Hide alarm condition if there's no alarm.

Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5
 2016-06-02 19:38:59 +00:00
Jorim Jaggi
79c0b2bcbb Merge "Also update setMinLines" into nyc-dev 2016-06-02 19:34:57 +00:00
Julia Reynolds
f584b1d96d Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
 2016-06-02 19:31:11 +00:00
Julia Reynolds
db3744969e Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
 2016-06-02 19:30:58 +00:00
Julia Reynolds
9548013287 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: Ib6c339aa3d00639fcad3bc15791787a52010a84f
 2016-06-02 19:30:52 +00:00
Julia Reynolds
b44ef7eb43 Fix memory leak via ZenModeController callbacks. 
Bug: 29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
 2016-06-02 19:30:50 +00:00
Julia Reynolds
48347048ba Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
 2016-06-02 19:30:50 +00:00
TreeHugger Robot
a31ac7ddfb Merge "Fix leak on density change." into nyc-dev 2016-06-02 19:24:16 +00:00
Julia Reynolds
62716a9197 Merge "Hide alarm condition if there's no alarm." into nyc-dev 2016-06-02 19:22:37 +00:00
Annie Chin
b6ab24f4d0 Remove SystemUIFactory.getHomeLayoutId() 
Bug: 29069470

Change-Id: I19078f293c85470caac8d372d80a7a8605842c61
 2016-06-02 12:18:38 -07:00
Jorim Jaggi
6afd156414 Fix unminimizing dock stack for AppTask.moveToFront 
Some apps call AppTask.moveToFront instead of startActivity from
their trampoline activity. We need to handle this case also and
need to do all the post processing after starting an activity
so the docked stack gets unminimized.

Change-Id: I8400995bf1d1a4a4467d01fd55fca7e5800b4645
Fixes: 28722017
 2016-06-02 19:14:06 +00:00
Muyuan Li
84b4561f1c sysui: refactor for extensibility. 
Refactor the test whether touch point is inside
QsContainer into a separate method.
Make mScrollingEnabled protected.

Bug: 28942125
Change-Id: I21a620bbad12c25fedfa5a1139221bd4cb2e95fe
(cherry picked from commit cc10182c291d3e559382ddd181b69c1e89e5ec8e)
 2016-06-02 19:12:44 +00:00
Chris Wren
c6a9857f35 Give the auto-merger somthing to hang on to. 
Bug: 29001173
Change-Id: Ie244f79f1569e2b32be4046d111919120ce6111e
 2016-06-02 15:11:48 -04:00
Dianne Hackborn
f83ba73011 Merge "Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: 340f22fcc6" into nyc-mr1-dev-plus-aosp 
am: b508d38074

* commit 'b508d380748c085858132ceda017fa946638fee2':

Change-Id: I64c67b04f75de07b5574330ce631de3e1f2567d9
 2016-06-02 19:04:02 +00:00